From 9b127fc0a349972b1312866766f288534b1d47e4 Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Fri, 14 Dec 2012 15:47:46 +0100 Subject: Add FindLTDL cmake module As mentionned in FindLTDL.cmake, this is code that is hereby relicensed under GPLv3. closes #68 --- src/plugins/test/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/plugins/test/CMakeLists.txt') diff --git a/src/plugins/test/CMakeLists.txt b/src/plugins/test/CMakeLists.txt index 5f86b6f..a68de2c 100644 --- a/src/plugins/test/CMakeLists.txt +++ b/src/plugins/test/CMakeLists.txt @@ -9,4 +9,4 @@ include_directories(".") include_directories("../../") include_directories("../../../") -target_link_libraries(manager_test ltdl) +target_link_libraries(manager_test ${LTDL_LIBRARY}) -- cgit v1.2.3-1-g7c22 From 3c976c040b48caa9f3e75d12a6502e39193ce9a6 Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Wed, 19 Dec 2012 16:52:11 +0100 Subject: Don't enforce CMake build type on users. Only set CMAKE_BUILD_TYPE to Debug when no value is provided. --- src/plugins/test/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/plugins/test/CMakeLists.txt') diff --git a/src/plugins/test/CMakeLists.txt b/src/plugins/test/CMakeLists.txt index a68de2c..ff4f67b 100644 --- a/src/plugins/test/CMakeLists.txt +++ b/src/plugins/test/CMakeLists.txt @@ -1,6 +1,8 @@ cmake_minimum_required(VERSION 2.8) -set(CMAKE_BUILD_TYPE debug) +if(NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE debug) +endif(NOT CMAKE_BUILD_TYPE) set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -O0 -std=c++11 -rdynamic") add_executable(manager_test manager_test.cpp ../../common/logger.cpp ../../common/profile.cpp ../../common/iman.cpp ../pluginmanager.cpp ../pluginloader.cpp) -- cgit v1.2.3-1-g7c22 From 7e9ef0c042fd14373a129ca8a5ac94e9679daee9 Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Wed, 19 Dec 2012 16:54:58 +0100 Subject: Put common CXX flags in common variables CMAKE_CXX_FLAGS is taken into account in all builds; build-type-specific flags are appended to it. --- src/plugins/test/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/plugins/test/CMakeLists.txt') diff --git a/src/plugins/test/CMakeLists.txt b/src/plugins/test/CMakeLists.txt index ff4f67b..31b4163 100644 --- a/src/plugins/test/CMakeLists.txt +++ b/src/plugins/test/CMakeLists.txt @@ -3,7 +3,8 @@ cmake_minimum_required(VERSION 2.8) if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE debug) endif(NOT CMAKE_BUILD_TYPE) -set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -O0 -std=c++11 -rdynamic") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++11 -rdynamic") +set(CMAKE_CXX_FLAGS_DEBUG "-g -O0") add_executable(manager_test manager_test.cpp ../../common/logger.cpp ../../common/profile.cpp ../../common/iman.cpp ../pluginmanager.cpp ../pluginloader.cpp) -- cgit v1.2.3-1-g7c22 From a6ff654ae37ca372d785c1e155fbfe67a3a25fed Mon Sep 17 00:00:00 2001 From: erihel Date: Thu, 20 Dec 2012 20:59:11 +0100 Subject: removing plugins for gold version (for mxe cross compiling) --- src/plugins/test/CMakeLists.txt | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 src/plugins/test/CMakeLists.txt (limited to 'src/plugins/test/CMakeLists.txt') diff --git a/src/plugins/test/CMakeLists.txt b/src/plugins/test/CMakeLists.txt deleted file mode 100644 index 31b4163..0000000 --- a/src/plugins/test/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -cmake_minimum_required(VERSION 2.8) - -if(NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE debug) -endif(NOT CMAKE_BUILD_TYPE) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++11 -rdynamic") -set(CMAKE_CXX_FLAGS_DEBUG "-g -O0") - -add_executable(manager_test manager_test.cpp ../../common/logger.cpp ../../common/profile.cpp ../../common/iman.cpp ../pluginmanager.cpp ../pluginloader.cpp) - -include_directories(".") -include_directories("../../") -include_directories("../../../") - -target_link_libraries(manager_test ${LTDL_LIBRARY}) -- cgit v1.2.3-1-g7c22