|
@@ -84,14 +84,6 @@ if (LEMMA_ENABLE_TESTING)
|
84
|
84
|
find_package (CxxTest QUIET) # Unit testing
|
85
|
85
|
endif()
|
86
|
86
|
|
87
|
|
-#######################################################################
|
88
|
|
-# CXXTEST Framework
|
89
|
|
-if(CXXTEST_FOUND)
|
90
|
|
- if (LEMMA_ENABLE_TESTING)
|
91
|
|
- #include_directories(${CXXTEST_INCLUDE_DIR}) # Add this in testing CMakeLists.txt instead, cleaner
|
92
|
|
- enable_testing()
|
93
|
|
- endif()
|
94
|
|
-endif()
|
95
|
87
|
|
96
|
88
|
## Optional Dependencies
|
97
|
89
|
if ( NOT Eigen3_FOUND OR
|
|
@@ -296,11 +288,20 @@ include_directories ("${CMAKE_INSTALL_PREFIX}/include/")
|
296
|
288
|
link_directories ("${CMAKE_INSTALL_PREFIX}/lib/")
|
297
|
289
|
|
298
|
290
|
|
299
|
|
-
|
300
|
291
|
########################################################################
|
301
|
292
|
# Build Modules
|
302
|
293
|
add_subdirectory (Modules)
|
303
|
294
|
|
|
295
|
+#######################################################################
|
|
296
|
+# CXXTEST Framework
|
|
297
|
+if(CXXTEST_FOUND)
|
|
298
|
+ if (LEMMA_ENABLE_TESTING)
|
|
299
|
+ include (CTest)
|
|
300
|
+ #include_directories(${CXXTEST_INCLUDE_DIR}) # Add this in testing CMakeLists.txt instead, cleaner
|
|
301
|
+ #enable_testing()
|
|
302
|
+ endif()
|
|
303
|
+endif()
|
|
304
|
+
|
304
|
305
|
########################################################################
|
305
|
306
|
# add a target to generate API documentation with Doxyfile.in
|
306
|
307
|
# ALL make documentation build by default if possible
|