Browse Source

Revert of yaml-cpp to 0.6.2 due to YAML_LIBRARIES not being set in master

master
Trevor Irons 4 years ago
parent
commit
69b36eb14a

+ 2
- 2
CMake/SuperBuild.cmake View File

@@ -22,8 +22,8 @@ if (yaml-cpp_FOUND)
22 22
 else()
23 23
     message( STATUS "YAML-CPP WAS NOT FOUND, BUILDING" )
24 24
     ExternalProject_Add(YAML_CPP
25
-        GIT_REPOSITORY  "https://github.com/jbeder/yaml-cpp.git"
26
-        GIT_TAG "master" # "yaml-cpp-0.6.2", # "master" 
25
+        GIT_REPOSITORY  "https://github.com/jbeder/yaml-cpp.git" 
26
+        GIT_TAG  "yaml-cpp-0.6.2"  # "master" 
27 27
         UPDATE_COMMAND ""
28 28
         PATCH_COMMAND ""
29 29
         PREFIX ${CMAKE_CURRENT_BINARY_DIR}/external/yaml-cpp

+ 5
- 5
CMakeLists.txt View File

@@ -70,8 +70,8 @@ if (CMAKE_CROSSCOMPILING)
70 70
 #            "Please create a separate binary directory and run CMake there.")
71 71
 #    endif()
72 72
 
73
-    find_package (yaml-cpp 0.6         PATHS ${CMAKE_INSTALL_PREFIX}  NO_DEFAULT_PATH) # Serialisation of classes 
74
-    find_package (Eigen3   3.3         PATHS ${CMAKE_INSTALL_PREFIX}  NO_DEFAULT_PATH) # Matrix/Vector & Math
73
+    find_package (yaml-cpp 0.6    PATHS ${CMAKE_INSTALL_PREFIX}  NO_DEFAULT_PATH) # Serialisation of classes 
74
+    find_package (Eigen3   3.3    PATHS ${CMAKE_INSTALL_PREFIX}  NO_DEFAULT_PATH) # Matrix/Vector & Math
75 75
 
76 76
     if (LEMMA_PYTHON3_BINDINGS)
77 77
         find_package(pybind11 PATHS ${CMAKE_INSTALL_PREFIX} NO_DEFAULT_PATH)           # Python 3 bindings
@@ -165,10 +165,10 @@ if ( NOT Eigen3_FOUND OR
165 165
     message ( STATUS "Missing hard dependencies have been found, these will be downloaded any compiled." )
166 166
     message ( STATUS "This necessitates a two step build." )
167 167
     message ( STATUS "Build these packages first...THEN RERUN CMAKE!" )
168
-    project (SUPERBUILD NONE)
168
+    project (SUPERBUILD NONE) 
169 169
   	# execute the superbuild (this script will be invoked again without the
170
-  	# USE_SUPERBUILD option this time)
171
-  	include (CMake/SuperBuild.cmake)
170
+  	# USE_SUPERBUILD option this time) 
171
+    include (CMake/SuperBuild.cmake)
172 172
   	return()                      # stop processing this file further
173 173
 else()
174 174
 	#project (Blah)               # <-- YOUR PROJECT NAME HERE

+ 6
- 2
Modules/DCIP/CMakeLists.txt View File

@@ -1,3 +1,7 @@
1
+option ( LEMMA_MODULE_DCIP TRUE )
2
+
3
+if (LEMMA_MODULE_DCIP) 
4
+
1 5
 # Configure EMSchur3D 
2 6
 set(DCIP_VERSION_MAJOR "0")
3 7
 set(DCIP_VERSION_MINOR "0")
@@ -5,8 +9,6 @@ set(DCIP_VERSION_PATCH "1")
5 9
 set(DCIP_VERSION "\"${DCIP_VERSION_MAJOR}.${DCIP_VERSION_MINOR}.${DCIP_VERSION_PATCH}\"")
6 10
 set(DCIP_VERSION_NOQUOTES "${DCIP_VERSION_MAJOR}.${DCIP_VERSION_MINOR}.${DCIP_VERSION_PATCH}")
7 11
 
8
-option ( LEMMA_MODULE_DCIP TRUE )
9
-
10 12
 configure_file (
11 13
 	"${CMAKE_CURRENT_SOURCE_DIR}/config/DCIPConfig.h.in"
12 14
 	"${PROJECT_BINARY_DIR}/include/DCIPConfig.h"
@@ -48,3 +50,5 @@ install ( FILES  ${PROJECT_BINARY_DIR}/include/DCIPConfig.h   DESTINATION ${CMAK
48 50
 	#if (LEMMA_BUILD_EXAMPLES)
49 51
 	#	add_subdirectory(examples)
50 52
 	#endif()
53
+
54
+endif()

+ 1
- 0
Modules/FDEM1D/CMakeLists.txt View File

@@ -12,6 +12,7 @@ set_target_properties(fdem1d PROPERTIES
12 12
 
13 13
 # Linking
14 14
 target_link_libraries(fdem1d "lemmacore")
15
+target_link_libraries(fdem1d ${YAML_CPP_LIBRARIES}) 
15 16
 
16 17
 if ( KIHA_EM1D )
17 18
 	target_link_libraries(fdem1d "kihaem1d")

+ 1
- 0
Modules/LemmaCore/CMakeLists.txt View File

@@ -24,6 +24,7 @@ set_target_properties(lemmacore PROPERTIES
24 24
 target_link_libraries (lemmacore Eigen3::Eigen)
25 25
 #target_link_libraries (lemmacore CxxTest)
26 26
 target_link_libraries (lemmacore ${YAML_CPP_LIBRARIES}) 
27
+target_link_libraries (lemmacore ${YAML_CPP_LIBRARY}) 
27 28
 
28 29
 # Linking
29 30
 if ( LEMMA_VTK6_SUPPORT OR LEMMA_VTK7_SUPPORT OR LEMMA_VTK8_SUPPORT ) 

Loading…
Cancel
Save