GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-06-26 10:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Linkage

Browse source 
- More build system cleanup and sync betweee 2.4 and 2.3.
This commit is contained in:
Paul Beckingham 2013-10-20 14:20:46 -04:00
parent 02aaba2f1a
commit 49c07acb05
7 changed files with 2 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -56,7 +56,6 @@ set (PACKAGE_STRING "${PACKAGE} ${VERSION}")
message ("-- Looking for GnuTLS")
find_package (GnuTLS)
if (GNUTLS_FOUND)
message ("-- Found GnuTLS: ${GNUTLS_LIBRARIES}")
set (HAVE_LIBGNUTLS true)
set (TASK_INCLUDE_DIRS ${TASK_INCLUDE_DIRS} ${GNUTLS_INCLUDE_DIR})
set (TASK_LIBRARIES ${TASK_LIBRARIES} ${GNUTLS_LIBRARIES})
@ -79,7 +78,6 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules")
message ("-- Looking for GNU Readline")
find_package (Readline)
if (READLINE_FOUND)
message ("-- Found GNU Readline: ${READLINE_LIBRARIES}")
set (HAVE_READLINE true)
set (TASK_INCLUDE_DIRS ${TASK_INCLUDE_DIRS} ${READLINE_INCLUDE_DIR})
set (TASK_LIBRARIES ${TASK_LIBRARIES} ${READLINE_LIBRARIES})
@ -90,7 +88,6 @@ check_function_exists (srandom HAVE_SRANDOM)
check_function_exists (timegm HAVE_TIMEGM)
check_function_exists (get_current_dir_name HAVE_GET_CURRENT_DIR_NAME)
check_struct_has_member ("struct tm" tm_gmtoff time.h HAVE_TM_GMTOFF)
check_struct_has_member ("struct stat" st_birthtime "sys/types.h;sys/stat.h" HAVE_ST_BIRTHTIME)

4
src/CMakeLists.txt
View file

@ -62,10 +62,6 @@ set_property (TARGET task_executable PROPERTY OUTPUT_NAME "task")
install (TARGETS task_executable DESTINATION ${TASK_BINDIR})
set (CMAKE_BUILD_TYPE debug)
set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -Wall")
set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -Wall")
#SET(CMAKE_BUILD_TYPE gcov)
#SET(CMAKE_CXX_FLAGS_GCOV "--coverage")
#SET(CMAKE_C_FLAGS_GCOV "--coverage")

5
src/columns/CMakeLists.txt
View file

@ -33,11 +33,6 @@ set (columns_SRCS Column.cpp Column.h
add_library (columns STATIC ${columns_SRCS})
set (CMAKE_BUILD_TYPE debug)
set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -Wall")
set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -Wall")
#SET(CMAKE_BUILD_TYPE gcov)
#SET(CMAKE_CXX_FLAGS_GCOV "--coverage")
#SET(CMAKE_C_FLAGS_GCOV "--coverage")

4
src/commands/CMakeLists.txt
View file

@ -55,10 +55,6 @@ set (commands_SRCS Command.cpp Command.h
add_library (commands STATIC ${commands_SRCS})
set (CMAKE_BUILD_TYPE debug)
set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -Wall")
set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -Wall")
#SET(CMAKE_BUILD_TYPE gcov)
#SET(CMAKE_CXX_FLAGS_GCOV "--coverage")
#SET(CMAKE_C_FLAGS_GCOV "--coverage")

31
src/parser/CMakeLists.txt
View file

@ -1,31 +0,0 @@
cmake_minimum_required (VERSION 2.8)
include_directories (${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/src
${CMAKE_SOURCE_DIR}/src/commands
${CMAKE_SOURCE_DIR}/src/columns
${CMAKE_SOURCE_DIR}/src/parser
${TASK_INCLUDE_DIRS})
set (parser_SRCS LRParser.cpp LRParser.h
Parser.cpp Parser.h
Tree.cpp Tree.h
A3.cpp A3.h
A3t.cpp A3t.h
Arg.cpp Arg.h
E9.cpp E9.h)
add_library (parser STATIC ${parser_SRCS})
add_executable (parser_executable bnf.cpp)
add_executable (args_executable args.cpp)
target_link_libraries (parser_executable columns commands task parser columns commands task ${TASK_LIBRARIES})
target_link_libraries (args_executable columns commands task parser columns commands task ${TASK_LIBRARIES})
set_property (TARGET parser_executable PROPERTY OUTPUT_NAME "parser")
set_property (TARGET args_executable PROPERTY OUTPUT_NAME "args")
#install (TARGETS parser_executable DESTINATION ${TASK_BINDIR})
set (CMAKE_BUILD_TYPE debug)
set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -Wall")
set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -Wall")

2
src/shell/CMakeLists.txt
View file

@ -12,7 +12,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 commands columns task tasksh ${TASK_LIBRARIES})
target_link_libraries (tasksh_executable task commands columns tasksh task ${TASK_LIBRARIES})
set_property (TARGET tasksh_executable PROPERTY OUTPUT_NAME "tasksh")

2
test/CMakeLists.txt
View file

@ -23,7 +23,7 @@ else (${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
set (TESTBLOB "${CMAKE_SOURCE_DIR}/test/*.t ${CMAKE_BINARY_DIR}/test/*.t")
if (CYGWIN)
set (TESTBLOB "${CMAKE_SOURCE_DIR}/test/*.t ${CMAKE_BINARY_DIR}/test/*.t.exe")
set (TESTBLOB "${CMAKE_SOURCE_DIR}/test/*.t ${CMAKE_BINARY_DIR}/test/*.t.exe")
endif (CYGWIN)
endif (${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})