Przeglądaj źródła

still cleaning up superbuild

iss7
Trevor Irons 5 lat temu
rodzic
commit
50e0028649
1 zmienionych plików z 13 dodań i 5 usunięć
  1. 13
    5
      CMakeLists.txt

+ 13
- 5
CMakeLists.txt Wyświetl plik

@@ -42,7 +42,7 @@ option ( LEMMA_ENABLE_TESTING       "Turn on unit testing" OFF )
42 42
 option ( LEMMA_BUILD_EXAMPLES       "Compile example Lemma applications" OFF )
43 43
 option ( LEMMA_USE_OPENMP           "Use OpenMP in Lemma" OFF )
44 44
 option ( LEMMA_BUILD_DOCUMENTATION  "Build Doxygen man pages" OFF )
45
-option ( LEMMA_VTK8_SUPPORT         "VTK 8.x library for visualisation and grids" OFF)
45
+option ( LEMMA_VTK8_SUPPORT         "VTK 8.x library for visualisation and grids" OFF )
46 46
 
47 47
 # We end up using this for all builds, TODO remove this variable but follow same path
48 48
 #option (CMAKE_CROSSCOMPILING "Target different arch than you are on" OFF)
@@ -58,11 +58,18 @@ SET (CMAKE_CROSSCOMPILING TRUE)
58 58
 if (CMAKE_CROSSCOMPILING)
59 59
     message ( STATUS "Performing SuperBuild") 
60 60
     project (CHECKSUPERBUILD CXX) # Necessary for VTK query 
61
+
62
+#    if ("${CHECKSUPERBUILD_SOURCE_DIR}"  STREQUAL "${CHECKSUPERBUILD_BINARY_DIR}")
63
+#        message(FATAL_ERROR
64
+#            "Lemma (SuperBuild) requires an out of source Build. "
65
+#            "Please create a separate binary directory and run CMake there.")
66
+#    endif()
67
+
61 68
     find_package (yaml-cpp 0.6         PATHS ${CMAKE_INSTALL_PREFIX}  NO_DEFAULT_PATH) # Serialisation of classes 
62 69
     find_package (Eigen3   3.3         PATHS ${CMAKE_INSTALL_PREFIX}  NO_DEFAULT_PATH) # Matrix/Vector & Math
63 70
 #${CMAKE_INSTALL_PREFIX}  NO_DEFAULT_PATH 
64 71
     if (LEMMA_VTK8_SUPPORT)                                                            # Visualisation 
65
-        find_package (VTK  8.2        
72
+        find_package (VTK  8.2.0      
66 73
         COMPONENTS 
67 74
         vtkCommonCore 
68 75
         vtkRenderingCore 
@@ -86,7 +93,7 @@ else()
86 93
     find_package (Eigen3   3.3 QUIET )  # Matrix/Vector & Math
87 94
     find_package (yaml-cpp 0.6 QUIET )  # Serialisation of classes 
88 95
     if (LEMMA_VTK8_SUPPORT)
89
-        find_package (VTK  8.2 COMPONENTS
96
+        find_package (VTK  8.2.0 COMPONENTS
90 97
         vtkCommonCore 
91 98
         vtkRenderingCore 
92 99
         vtkFiltersCore 
@@ -108,9 +115,10 @@ endif()
108 115
 
109 116
 INCLUDE_DIRECTORIES(${YAML_CPP_INCLUDE_DIR})
110 117
 if (VTK_VERSION VERSION_GREATER "8.2.0")
111
-    message( STATUS "${VTK_VERSION} is compatible: ${VTK_VERSION_COMPATIBLE}" )
112
-    #set (VTK_FOUND False) 
118
+    message( STATUS "${VTK_VERSION} is compatible: ${VTK_VERSION_COMPATIBLE} exact? ${VTK_VERSION_EXACT}" )
119
+    set (VTK_FOUND False) 
113 120
 endif()
121
+
114 122
 if (VTK_FOUND)
115 123
     set(volumeRenderer volumerenderer.cxx)
116 124
 	add_definitions(-DLEMMAUSEVTK) 

Ładowanie…
Anuluj
Zapisz