Переглянути джерело

Fix on MacOS which does not default to CXX-11

add-code-of-conduct-1
tirons 6 роки тому
джерело
коміт
d8e73980f9

+ 2
- 2
Modules/DCIP/CMakeLists.txt Переглянути файл

@@ -21,8 +21,8 @@ install ( FILES  ${PROJECT_BINARY_DIR}/include/EMSchur3DConfig.h   DESTINATION $
21 21
 		VERSION  "${DCIP_VERSION_NOQUOTES}"
22 22
 		SOVERSION "${DCIP_VERSION_MAJOR}.${LEMMA_VERSION_MINOR}"
23 23
 		PROJECT_LABEL "DCIP ${LABEL_SUFFIX}"
24
-    	CXX_STANDARD_14
25
-    	CXX_STANDARD_REQUIRED_ON
24
+    	CXX_STANDARD 14
25
+    	CXX_STANDARD_REQUIRED ON
26 26
 	)
27 27
 
28 28
 	# Linking

+ 7
- 0
Modules/FDEM1D/testing/CMakeLists.txt Переглянути файл

@@ -5,3 +5,10 @@ target_link_libraries(unittest_FEM1D_GetNameCheck "lemmacore" "fdem1d" "yaml-cpp
5 5
 
6 6
 CXXTEST_ADD_TEST(unittest_FEM1D_SerializeCheck SerializeCheck.cc ${CMAKE_CURRENT_SOURCE_DIR}/SerializeCheck.h)
7 7
 target_link_libraries(unittest_FEM1D_SerializeCheck "lemmacore" "fdem1d" "yaml-cpp")
8
+
9
+set_target_properties(unittest_FEM1D_GetNameCheck
10
+	              unittest_FEM1D_SerializeCheck 
11
+       	PROPERTIES 
12
+	CXX_STANDARD 14
13
+	CXX_STANDARD_REQUIRED ON
14
+	)

+ 7
- 0
Modules/LemmaCore/testing/CMakeLists.txt Переглянути файл

@@ -13,3 +13,10 @@ target_link_libraries(unittest_LemmaCore_SerializeCheck "lemmacore")
13 13
 CXXTEST_ADD_TEST(unittest_LemmaCore_CopyDisableCheck CopyDisableCheck.cc ${CMAKE_CURRENT_SOURCE_DIR}/CopyDisableCheck.h)
14 14
 target_link_libraries(unittest_LemmaCore_CopyDisableCheck "lemmacore")
15 15
  
16
+set_target_properties( unittest_LemmaCore_GetNameCheck 
17
+	               unittest_LemmaCore_SerializeCheck
18
+		       unittest_LemmaCore_CopyDisableCheck
19
+	PROPERTIES
20
+	CXX_STANDARD 14 
21
+	CXX_STANDARD_REQUIRED ON
22
+	)

+ 7
- 0
Modules/TEM1D/testing/CMakeLists.txt Переглянути файл

@@ -6,3 +6,10 @@ target_link_libraries(unittest_TEM1D_GetNameCheck "lemmacore" "fdem1d" "tem1d")
6 6
 
7 7
 CXXTEST_ADD_TEST(unittest_TEM1D_SerializeCheck SerializeCheck.cc ${CMAKE_CURRENT_SOURCE_DIR}/SerializeCheck.h)
8 8
 target_link_libraries(unittest_TEM1D_SerializeCheck "lemmacore" "fdem1d" "tem1d")
9
+
10
+set_target_properties( unittest_TEM1D_GetNameCheck 
11
+	               unittest_TEM1D_SerializeCheck
12
+	PROPERTIES
13
+	CXX_STANDARD 14
14
+	CXX_STANDARD_REQUIRED ON
15
+)

Завантаження…
Відмінити
Зберегти