|
@@ -70,13 +70,10 @@ ExternalProject_Add(YAML-CPP
|
70
|
70
|
PATCH_COMMAND ""
|
71
|
71
|
PREFIX ${CMAKE_CURRENT_BINARY_DIR}/external/yaml-cpp
|
72
|
72
|
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX} -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} /
|
73
|
|
- -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} /
|
74
|
|
- -DYAML_CPP_BUILD_TESTS=OFF
|
75
|
|
- #-D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING /
|
76
|
|
- #-DCXX_STANDARD=11 /
|
77
|
|
- #-DCXX_STANDARD_REQUIRED=ON
|
|
73
|
+ -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} /
|
|
74
|
+ -DYAML_CPP_BUILD_TESTS=OFF
|
78
|
75
|
)
|
79
|
|
-add_compile_options(-DHAVE_YAMLCPP)
|
|
76
|
+#add_compile_options(-DHAVE_YAMLCPP)
|
80
|
77
|
|
81
|
78
|
# CxxTest
|
82
|
79
|
find_package(CxxTest)
|
|
@@ -199,25 +196,6 @@ endif()
|
199
|
196
|
####################
|
200
|
197
|
SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
|
201
|
198
|
|
202
|
|
-####################
|
203
|
|
-# Add the c++11 flag
|
204
|
|
-# This has been moved to TARGET PROPERTY as each library is built
|
205
|
|
-# TODO add compiler specific instructions
|
206
|
|
-#include(CheckCXXCompilerFlag)
|
207
|
|
-#CHECK_CXX_COMPILER_FLAG(-std=c++14 COMPILER_SUPPORTS_CXX14)
|
208
|
|
-#CHECK_CXX_COMPILER_FLAG(-std=c++11 COMPILER_SUPPORTS_CXX11)
|
209
|
|
-#CHECK_CXX_COMPILER_FLAG(-std=c++0x COMPILER_SUPPORTS_CXX0X)
|
210
|
|
-# TODO update this for MSVC and cross compatibility
|
211
|
|
-#if(COMPILER_SUPPORTS_CXX14)
|
212
|
|
-# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
|
213
|
|
-#elseif(COMPILER_SUPPORTS_CXX11)
|
214
|
|
-# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
|
215
|
|
-#elseif(COMPILER_SUPPORTS_CXX0X)
|
216
|
|
-# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
|
217
|
|
-#else()
|
218
|
|
-# message(FATAL_ERROR "The compiler ${CMAKE_CXX_COMPILER} has no C++11 or C++14 support. Please use a different C++ compiler.")
|
219
|
|
-#endif()
|
220
|
|
-
|
221
|
199
|
option( LEMMA_BUILD_EXAMPLES "Compile example Lemma applications" OFF )
|
222
|
200
|
|
223
|
201
|
option( LEMMA_USE_OPENMP "Use OpenMP in Lemma" OFF)
|