gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Build Error

Browse Source 
- Fixed lib deps for one platform.
This commit is contained in:
Paul Beckingham
2013-09-01 14:57:57 -04:00
parent bdf88d10a7
commit 94dc0c1b2d
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -141,8 +141,8 @@ configure_file (
add_subdirectory (src) add_subdirectory (src)
add_subdirectory (src/commands) add_subdirectory (src/commands)
add_subdirectory (src/columns) add_subdirectory (src/columns)
add_subdirectory (src/shell)
add_subdirectory (src/parser) add_subdirectory (src/parser)
add_subdirectory (src/shell)
add_subdirectory (doc) add_subdirectory (doc)
add_subdirectory (i18n) add_subdirectory (i18n)
add_subdirectory (scripts) add_subdirectory (scripts)

2
src/parser/CMakeLists.txt
View File

@@ -1,8 +1,8 @@
cmake_minimum_required (VERSION 2.8) cmake_minimum_required (VERSION 2.8)
include_directories (${CMAKE_SOURCE_DIR} include_directories (${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src
${CMAKE_SOURCE_DIR}/src/columns
${CMAKE_SOURCE_DIR}/src/commands ${CMAKE_SOURCE_DIR}/src/commands
${CMAKE_SOURCE_DIR}/src/columns
${CMAKE_SOURCE_DIR}/src/parser ${CMAKE_SOURCE_DIR}/src/parser
${TASK_INCLUDE_DIRS}) ${TASK_INCLUDE_DIRS})

3
src/shell/CMakeLists.txt
View File

@@ -3,6 +3,7 @@ include_directories (${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src
${CMAKE_SOURCE_DIR}/src/commands ${CMAKE_SOURCE_DIR}/src/commands
${CMAKE_SOURCE_DIR}/src/columns ${CMAKE_SOURCE_DIR}/src/columns
${CMAKE_SOURCE_DIR}/src/parser
${CMAKE_SOURCE_DIR}/src/shell ${CMAKE_SOURCE_DIR}/src/shell
${TASK_INCLUDE_DIRS}) ${TASK_INCLUDE_DIRS})
@@ -12,7 +13,7 @@ add_library (tasksh STATIC ${tasksh_SRCS})
add_executable (tasksh_executable main.cpp) add_executable (tasksh_executable main.cpp)
# Yes, 'task' is included twice, other linking fails on CentOS. # 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") set_property (TARGET tasksh_executable PROPERTY OUTPUT_NAME "tasksh")