#115 fixe ctests

diff --git a/tcejdb/CMakeLists.txt b/tcejdb/CMakeLists.txt
index e66232c..f768833 100644 (file)
--- a/tcejdb/CMakeLists.txt
+++ b/tcejdb/CMakeLists.txt
@@ -43,6 +43,11 @@ macro_ensure_out_of_source_build(
     "${CMAKE_PROJECT_NAME} requires an out of source build."
 )
 
+if (BUILD_TESTS) 
+       include(CTest)
+       find_package(CUnit REQUIRED)
+endif(BUILD_TESTS)
+
 if (UPLOAD_PPA)
        set(ENABLE_PPA ON)
 endif()

diff --git a/tcejdb/ctest.cmake b/tcejdb/ctest.cmake
index cf6a08f..01c63e2 100644 (file)
--- a/tcejdb/ctest.cmake
+++ b/tcejdb/ctest.cmake
@@ -1,8 +1,5 @@
-# Source directory: /home/adam/Projects/softmotions/ejdb/tcejdb
-# Build directory: /home/adam/Projects/softmotions/ejdb/tcejdb
-
 set(CTEST_SOURCE_DIRECTORY /home/adam/Projects/softmotions/ejdb/tcejdb)
-set(CTEST_BINARY_DIRECTORY /home/adam/Projects/softmotions/ejdb/tcejdb/build)
+set(CTEST_BINARY_DIRECTORY /home/adam/Projects/softmotions/ejdb/build)
 
 set(CTEST_START_WITH_EMPTY_BINARY_DIRECTORY TRUE)
 set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
@@ -10,7 +7,7 @@ set(CTEST_BUILD_CONFIGURATION "Debug")
 set(CTEST_BUILD_OPTIONS)
 
 set(CTEST_CONFIGURE_COMMAND "${CMAKE_COMMAND} -DCMAKE_BUILD_TYPE:STRING=${CTEST_BUILD_CONFIGURATION}")
-set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} -DWITH_TESTS:BOOL=ON ${CTEST_BUILD_OPTIONS}")
+set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} -DBUILD_TESTS:BOOL=ON ${CTEST_BUILD_OPTIONS}")
 set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} \"-G${CTEST_CMAKE_GENERATOR}\"")
 set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} \"${CTEST_SOURCE_DIRECTORY}\"")
 

diff --git a/tcejdb/src/CMakeLists.txt b/tcejdb/src/CMakeLists.txt
index 7b15ca0..fb60e48 100644 (file)
--- a/tcejdb/src/CMakeLists.txt
+++ b/tcejdb/src/CMakeLists.txt
@@ -184,11 +184,6 @@ if (NOT APPLE AND NOT BUILD_FRAMEWORK)
        install(FILES ${EJDB_GENERATED_DIR}/libejdb.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 endif(NOT APPLE AND NOT BUILD_FRAMEWORK)
 
-if (BUILD_TESTS) 
-       include(CTest)
-       find_package(CUnit REQUIRED)
-endif(BUILD_TESTS)
-
 foreach(MODULE IN LISTS MODULES)
        if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}/CMakeLists.txt)
                add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/${MODULE})