Browse Source

MSVC compiler work continues

submodule
Trevor Irons 6 years ago
parent
commit
439fd3310a
2 changed files with 3 additions and 26 deletions
  1. 3
    25
      CMakeLists.txt
  2. 0
    1
      Modules/FDEM1D/CMakeLists.txt

+ 3
- 25
CMakeLists.txt View File

70
 	PATCH_COMMAND ""
70
 	PATCH_COMMAND ""
71
     PREFIX ${CMAKE_CURRENT_BINARY_DIR}/external/yaml-cpp
71
     PREFIX ${CMAKE_CURRENT_BINARY_DIR}/external/yaml-cpp
72
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX} -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} /
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
 # CxxTest 
78
 # CxxTest 
82
 find_package(CxxTest) 
79
 find_package(CxxTest) 
199
 ####################
196
 ####################
200
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
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
 option( LEMMA_BUILD_EXAMPLES "Compile example Lemma applications" OFF )
199
 option( LEMMA_BUILD_EXAMPLES "Compile example Lemma applications" OFF )
222
 
200
 
223
 option( LEMMA_USE_OPENMP  "Use OpenMP in Lemma" OFF)
201
 option( LEMMA_USE_OPENMP  "Use OpenMP in Lemma" OFF)

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

11
 )
11
 )
12
 
12
 
13
 # Linking
13
 # Linking
14
-target_link_libraries(fdem1d "yaml-cpp")
15
 target_link_libraries(fdem1d "lemmacore")
14
 target_link_libraries(fdem1d "lemmacore")
16
 
15
 
17
 if ( KIHA_EM1D )
16
 if ( KIHA_EM1D )

Loading…
Cancel
Save