From 49c07acb055bf3ff682a668a5ac51217fe2c0f0f Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sun, 20 Oct 2013 14:20:46 -0400 Subject: [PATCH] Linkage - More build system cleanup and sync betweee 2.4 and 2.3. --- CMakeLists.txt | 3 --- src/CMakeLists.txt | 4 ---- src/columns/CMakeLists.txt | 5 ----- src/commands/CMakeLists.txt | 4 ---- src/parser/CMakeLists.txt | 31 ------------------------------- src/shell/CMakeLists.txt | 2 +- test/CMakeLists.txt | 2 +- 7 files changed, 2 insertions(+), 49 deletions(-) delete mode 100644 src/parser/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 2c5805a3a..5b0748513 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fcb41196b..119da339a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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") diff --git a/src/columns/CMakeLists.txt b/src/columns/CMakeLists.txt index 652bf151a..e1e1a5637 100644 --- a/src/columns/CMakeLists.txt +++ b/src/columns/CMakeLists.txt @@ -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") diff --git a/src/commands/CMakeLists.txt b/src/commands/CMakeLists.txt index 451e0724d..fc763f122 100644 --- a/src/commands/CMakeLists.txt +++ b/src/commands/CMakeLists.txt @@ -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") diff --git a/src/parser/CMakeLists.txt b/src/parser/CMakeLists.txt deleted file mode 100644 index 7ddc279d5..000000000 --- a/src/parser/CMakeLists.txt +++ /dev/null @@ -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") diff --git a/src/shell/CMakeLists.txt b/src/shell/CMakeLists.txt index 9fc040b9c..69450e47d 100644 --- a/src/shell/CMakeLists.txt +++ b/src/shell/CMakeLists.txt @@ -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") diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 936a683ba..23566b00e 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -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})