Browse Source

Updates to external yaml-cpp for shared library build

master
Trevor Irons 4 years ago
parent
commit
55efd7a3b4
3 changed files with 8 additions and 3 deletions
  1. 1
    1
      CMake/FindUmfpack.cmake
  2. 2
    2
      CMake/SuperBuild.cmake
  3. 5
    0
      CMakeLists.txt

+ 1
- 1
CMake/FindUmfpack.cmake View File

47
 endif(UMFPACK_LIBRARIES)
47
 endif(UMFPACK_LIBRARIES)
48
 
48
 
49
 include(FindPackageHandleStandardArgs)
49
 include(FindPackageHandleStandardArgs)
50
-find_package_handle_standard_args(UMFPACK DEFAULT_MSG
50
+find_package_handle_standard_args(Umfpack DEFAULT_MSG
51
                                   UMFPACK_INCLUDES UMFPACK_LIBRARIES)
51
                                   UMFPACK_INCLUDES UMFPACK_LIBRARIES)
52
 
52
 
53
 mark_as_advanced(UMFPACK_INCLUDES UMFPACK_LIBRARIES AMD_LIBRARY COLAMD_LIBRARY CHOLMOD_LIBRARY SUITESPARSE_LIBRARY)
53
 mark_as_advanced(UMFPACK_INCLUDES UMFPACK_LIBRARIES AMD_LIBRARY COLAMD_LIBRARY CHOLMOD_LIBRARY SUITESPARSE_LIBRARY)

+ 2
- 2
CMake/SuperBuild.cmake View File

8
         ExternalProject_Add(EIGEN
8
         ExternalProject_Add(EIGEN
9
 	    GIT_REPOSITORY "https://gitlab.com/libeigen/eigen.git"
9
 	    GIT_REPOSITORY "https://gitlab.com/libeigen/eigen.git"
10
         UPDATE_COMMAND "" 
10
         UPDATE_COMMAND "" 
11
-	    GIT_TAG "3.3.7" #"default"
11
+	    GIT_TAG "3.3.7" 
12
    	    PREFIX ${CMAKE_CURRENT_BINARY_DIR}/external/eigen
12
    	    PREFIX ${CMAKE_CURRENT_BINARY_DIR}/external/eigen
13
    	    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
13
    	    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
14
 		#CONFIGURE_COMMAND ""
14
 		#CONFIGURE_COMMAND ""
29
         PATCH_COMMAND ""
29
         PATCH_COMMAND ""
30
         PREFIX ${CMAKE_CURRENT_BINARY_DIR}/external/yaml-cpp
30
         PREFIX ${CMAKE_CURRENT_BINARY_DIR}/external/yaml-cpp
31
         CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX} 
31
         CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX} 
32
-                   -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
32
+                   -DYAML_BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} 
33
                    -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} 
33
                    -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} 
34
     	           -DYAML_CPP_BUILD_TESTS=OFF
34
     	           -DYAML_CPP_BUILD_TESTS=OFF
35
                    -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
35
                    -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}

+ 5
- 0
CMakeLists.txt View File

155
 if (VTK_FOUND)
155
 if (VTK_FOUND)
156
     set(volumeRenderer volumerenderer.cxx)
156
     set(volumeRenderer volumerenderer.cxx)
157
 	add_definitions(-DLEMMAUSEVTK) 
157
 	add_definitions(-DLEMMAUSEVTK) 
158
+	if (LEMMA_VTK8_SUPPORT)
159
+    add_definitions(-DLEMMA_VTK8_SUPPORT)
160
+    else (LEMMA_VTK9_SUPPORT) 
161
+    add_definitions(-DLEMMA_VTK9_SUPPORT)
162
+    endif()
158
 endif()
163
 endif()
159
 
164
 
160
 if (LEMMA_BUILD_DOCUMENTATION)
165
 if (LEMMA_BUILD_DOCUMENTATION)

Loading…
Cancel
Save