Browse Source

vtk on mac work

iss7
Trevor Irons 5 years ago
parent
commit
09854480dd
2 changed files with 7 additions and 14 deletions
  1. 0
    8
      CMake/SuperBuild.cmake
  2. 7
    6
      CMakeLists.txt

+ 0
- 8
CMake/SuperBuild.cmake View File

146
 	)
146
 	)
147
 endif()
147
 endif()
148
 
148
 
149
-#ExternalProject_Add (Lemma_SB
150
-#  DEPENDS ${DEPENDENCIES}
151
-#  SOURCE_DIR ${PROJECT_SOURCE_DIR}
152
-#  CMAKE_ARGS -DUSE_SUPERBUILD=OFF ${EXTRA_CMAKE_ARGS}
153
-#  INSTALL_COMMAND ""
154
-#  BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/blah)
155
-
156
-
157
 # vim: set tabstop=4 shiftwidth=4 expandtab: 
149
 # vim: set tabstop=4 shiftwidth=4 expandtab: 

+ 7
- 6
CMakeLists.txt View File

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
-    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
61
+    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
63
     if (LEMMA_VTK8_SUPPORT)
63
     if (LEMMA_VTK8_SUPPORT)
64
-        find_package (VTK      8.2.0 EXACT PATHS ${CMAKE_INSTALL_PREFIX}  NO_DEFAULT_PATH ) # Visualization 
64
+        find_package (VTK  8.2.0 EXACT PATHS ${CMAKE_INSTALL_PREFIX}  NO_DEFAULT_PATH) # Visualization 
65
     endif()
65
     endif()
66
 else()
66
 else()
67
     find_package (Eigen3   3.3 QUIET )  # Matrix/Vector & Math
67
     find_package (Eigen3   3.3 QUIET )  # Matrix/Vector & Math
68
     find_package (yaml-cpp 0.6 QUIET )  # Serialisation of classes 
68
     find_package (yaml-cpp 0.6 QUIET )  # Serialisation of classes 
69
     if (LEMMA_VTK8_SUPPORT)
69
     if (LEMMA_VTK8_SUPPORT)
70
-        find_package (VTK      8.2 QUIET )  # Visualization 
70
+        find_package (VTK  8.2 QUIET )  # Visualization 
71
     endif()
71
     endif()
72
 endif()
72
 endif()
73
 
73
 
96
     find_package (CxxTest QUIET)   # Unit testing 
96
     find_package (CxxTest QUIET)   # Unit testing 
97
 endif()
97
 endif()
98
 
98
 
99
-
99
+    
100
+message ( STATUS "VTK Found? " ${VTK_FOUND} )
100
 ## Optional Dependencies
101
 ## Optional Dependencies
101
 if ( NOT Eigen3_FOUND OR 
102
 if ( NOT Eigen3_FOUND OR 
102
      NOT yaml-cpp_FOUND OR 
103
      NOT yaml-cpp_FOUND OR 
111
   	include (CMake/SuperBuild.cmake)
112
   	include (CMake/SuperBuild.cmake)
112
   	return()                      # stop processing this file further
113
   	return()                      # stop processing this file further
113
 else()
114
 else()
114
-	#project (Blah)                # <-- YOUR PROJECT NAME HERE
115
+	#project (Blah)               # <-- YOUR PROJECT NAME HERE
115
 	message( STATUS "Everything was found, happy Lemma-ing" )
116
 	message( STATUS "Everything was found, happy Lemma-ing" )
116
 endif()
117
 endif()
117
 
118
 

Loading…
Cancel
Save