|
@@ -39,6 +39,7 @@ option (LEMMA_VTK8_SUPPORT "VTK 8.x library for visualisation and grids" OFF)
|
39
|
39
|
|
40
|
40
|
#option (CMAKE_CROSSCOMPILING "Target different arch than you are on" OFF)
|
41
|
41
|
|
|
42
|
+
|
42
|
43
|
##########################################################################################
|
43
|
44
|
## Only look for packages where we build them...this makes finding VTK a problem though! #
|
44
|
45
|
##########################################################################################
|
|
@@ -112,6 +113,13 @@ set(CMAKE_MACOSX_RPATH 1)
|
112
|
113
|
|
113
|
114
|
project (Lemma CXX)
|
114
|
115
|
|
|
116
|
+if(CXXTEST_FOUND)
|
|
117
|
+ if (LEMMA_ENABLE_TESTING)
|
|
118
|
+ #include (CTest)
|
|
119
|
+ enable_testing()
|
|
120
|
+ endif()
|
|
121
|
+endif()
|
|
122
|
+
|
115
|
123
|
# Disallow in-source build
|
116
|
124
|
if ("${Lemma_SOURCE_DIR}" STREQUAL "${Lemma_BINARY_DIR}")
|
117
|
125
|
message(FATAL_ERROR
|
|
@@ -294,13 +302,12 @@ add_subdirectory (Modules)
|
294
|
302
|
|
295
|
303
|
#######################################################################
|
296
|
304
|
# 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
|
|
305
|
+#if(CXXTEST_FOUND)
|
|
306
|
+# if (LEMMA_ENABLE_TESTING)
|
|
307
|
+# include (CTest)
|
301
|
308
|
#enable_testing()
|
302
|
|
- endif()
|
303
|
|
-endif()
|
|
309
|
+# endif()
|
|
310
|
+#endif()
|
304
|
311
|
|
305
|
312
|
########################################################################
|
306
|
313
|
# add a target to generate API documentation with Doxyfile.in
|