From 94dc0c1b2d7d80af4c398626514adb6d6925ece7 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sun, 1 Sep 2013 14:57:57 -0400 Subject: [PATCH] Build Error - Fixed lib deps for one platform. --- CMakeLists.txt | 2 +- src/parser/CMakeLists.txt | 2 +- src/shell/CMakeLists.txt | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f5572314d..3407a507e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -141,8 +141,8 @@ configure_file ( add_subdirectory (src) add_subdirectory (src/commands) add_subdirectory (src/columns) -add_subdirectory (src/shell) add_subdirectory (src/parser) +add_subdirectory (src/shell) add_subdirectory (doc) add_subdirectory (i18n) add_subdirectory (scripts) diff --git a/src/parser/CMakeLists.txt b/src/parser/CMakeLists.txt index 61b96efb1..f3840748c 100644 --- a/src/parser/CMakeLists.txt +++ b/src/parser/CMakeLists.txt @@ -1,8 +1,8 @@ cmake_minimum_required (VERSION 2.8) include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src - ${CMAKE_SOURCE_DIR}/src/columns ${CMAKE_SOURCE_DIR}/src/commands + ${CMAKE_SOURCE_DIR}/src/columns ${CMAKE_SOURCE_DIR}/src/parser ${TASK_INCLUDE_DIRS}) diff --git a/src/shell/CMakeLists.txt b/src/shell/CMakeLists.txt index 69450e47d..5b5dcb40e 100644 --- a/src/shell/CMakeLists.txt +++ b/src/shell/CMakeLists.txt @@ -3,6 +3,7 @@ include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/commands ${CMAKE_SOURCE_DIR}/src/columns + ${CMAKE_SOURCE_DIR}/src/parser ${CMAKE_SOURCE_DIR}/src/shell ${TASK_INCLUDE_DIRS}) @@ -12,7 +13,7 @@ add_library (tasksh STATIC ${tasksh_SRCS}) add_executable (tasksh_executable main.cpp) # Yes, 'task' is included twice, other linking fails on CentOS. -target_link_libraries (tasksh_executable task commands columns tasksh task ${TASK_LIBRARIES}) +target_link_libraries (tasksh_executable task commands columns parser tasksh task ${TASK_LIBRARIES}) set_property (TARGET tasksh_executable PROPERTY OUTPUT_NAME "tasksh")