Browse Source

still cleaning up superbuild

iss7
Trevor Irons 5 years ago
parent
commit
50e0028649
1 changed files with 13 additions and 5 deletions
  1. 13
    5
      CMakeLists.txt

+ 13
- 5
CMakeLists.txt View File

42
 option ( LEMMA_BUILD_EXAMPLES       "Compile example Lemma applications" OFF )
42
 option ( LEMMA_BUILD_EXAMPLES       "Compile example Lemma applications" OFF )
43
 option ( LEMMA_USE_OPENMP           "Use OpenMP in Lemma" OFF )
43
 option ( LEMMA_USE_OPENMP           "Use OpenMP in Lemma" OFF )
44
 option ( LEMMA_BUILD_DOCUMENTATION  "Build Doxygen man pages" OFF )
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
 # We end up using this for all builds, TODO remove this variable but follow same path
47
 # We end up using this for all builds, TODO remove this variable but follow same path
48
 #option (CMAKE_CROSSCOMPILING "Target different arch than you are on" OFF)
48
 #option (CMAKE_CROSSCOMPILING "Target different arch than you are on" OFF)
58
 if (CMAKE_CROSSCOMPILING)
58
 if (CMAKE_CROSSCOMPILING)
59
     message ( STATUS "Performing SuperBuild") 
59
     message ( STATUS "Performing SuperBuild") 
60
     project (CHECKSUPERBUILD CXX) # Necessary for VTK query 
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
     find_package (yaml-cpp 0.6         PATHS ${CMAKE_INSTALL_PREFIX}  NO_DEFAULT_PATH) # Serialisation of classes 
68
     find_package (yaml-cpp 0.6         PATHS ${CMAKE_INSTALL_PREFIX}  NO_DEFAULT_PATH) # Serialisation of classes 
62
     find_package (Eigen3   3.3         PATHS ${CMAKE_INSTALL_PREFIX}  NO_DEFAULT_PATH) # Matrix/Vector & Math
69
     find_package (Eigen3   3.3         PATHS ${CMAKE_INSTALL_PREFIX}  NO_DEFAULT_PATH) # Matrix/Vector & Math
63
 #${CMAKE_INSTALL_PREFIX}  NO_DEFAULT_PATH 
70
 #${CMAKE_INSTALL_PREFIX}  NO_DEFAULT_PATH 
64
     if (LEMMA_VTK8_SUPPORT)                                                            # Visualisation 
71
     if (LEMMA_VTK8_SUPPORT)                                                            # Visualisation 
65
-        find_package (VTK  8.2        
72
+        find_package (VTK  8.2.0      
66
         COMPONENTS 
73
         COMPONENTS 
67
         vtkCommonCore 
74
         vtkCommonCore 
68
         vtkRenderingCore 
75
         vtkRenderingCore 
86
     find_package (Eigen3   3.3 QUIET )  # Matrix/Vector & Math
93
     find_package (Eigen3   3.3 QUIET )  # Matrix/Vector & Math
87
     find_package (yaml-cpp 0.6 QUIET )  # Serialisation of classes 
94
     find_package (yaml-cpp 0.6 QUIET )  # Serialisation of classes 
88
     if (LEMMA_VTK8_SUPPORT)
95
     if (LEMMA_VTK8_SUPPORT)
89
-        find_package (VTK  8.2 COMPONENTS
96
+        find_package (VTK  8.2.0 COMPONENTS
90
         vtkCommonCore 
97
         vtkCommonCore 
91
         vtkRenderingCore 
98
         vtkRenderingCore 
92
         vtkFiltersCore 
99
         vtkFiltersCore 
108
 
115
 
109
 INCLUDE_DIRECTORIES(${YAML_CPP_INCLUDE_DIR})
116
 INCLUDE_DIRECTORIES(${YAML_CPP_INCLUDE_DIR})
110
 if (VTK_VERSION VERSION_GREATER "8.2.0")
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
 endif()
120
 endif()
121
+
114
 if (VTK_FOUND)
122
 if (VTK_FOUND)
115
     set(volumeRenderer volumerenderer.cxx)
123
     set(volumeRenderer volumerenderer.cxx)
116
 	add_definitions(-DLEMMAUSEVTK) 
124
 	add_definitions(-DLEMMAUSEVTK) 

Loading…
Cancel
Save