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,12 +146,4 @@ if ( LEMMA_MATIO_SUPPORT )
146 146
 	)
147 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 149
 # vim: set tabstop=4 shiftwidth=4 expandtab: 

+ 7
- 6
CMakeLists.txt View File

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

Loading…
Cancel
Save