Commit dc2e4c4d authored by Martin Heistermann's avatar Martin Heistermann
Browse files

Rename OVM_CXX_VERSION to more natural OVM_CXX_STANDARD

parent e3f93d3c
Pipeline #12172 failed with stage
in 5 minutes and 42 seconds
...@@ -21,8 +21,8 @@ set(OVM_ENABLE_UNITTESTS ${OVM_STANDALONE_BUILD} CACHE BOOL "Build OpenVolumeMes ...@@ -21,8 +21,8 @@ set(OVM_ENABLE_UNITTESTS ${OVM_STANDALONE_BUILD} CACHE BOOL "Build OpenVolumeMes
set(OVM_ENABLE_EXAMPLES ${OVM_STANDALONE_BUILD} CACHE BOOL "Build OpenVolumeMesh examples") set(OVM_ENABLE_EXAMPLES ${OVM_STANDALONE_BUILD} CACHE BOOL "Build OpenVolumeMesh examples")
set(OVM_BUILD_DOCUMENTATION ${OVM_STANDALONE_BUILD} CACHE BOOL "Build OpenVolumeMesh documentation") set(OVM_BUILD_DOCUMENTATION ${OVM_STANDALONE_BUILD} CACHE BOOL "Build OpenVolumeMesh documentation")
set(OVM_CXX_VERSION 11 CACHE STRING "C++ version to use") set(OVM_CXX_STANDARD 11 CACHE STRING "C++ standard version to use")
set_property(CACHE OVM_CXX_VERSION PROPERTY STRINGS 11 14 17 20) set_property(CACHE OVM_CXX_STANDARD PROPERTY STRINGS 11 14 17 20)
if (OVM_STANDALONE_BUILD) if (OVM_STANDALONE_BUILD)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/Build/bin") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/Build/bin")
......
...@@ -12,7 +12,7 @@ add_executable(simple_mesh simple_mesh/simple_mesh.cc) ...@@ -12,7 +12,7 @@ add_executable(simple_mesh simple_mesh/simple_mesh.cc)
target_link_libraries(simple_mesh OpenVolumeMesh::OpenVolumeMesh) target_link_libraries(simple_mesh OpenVolumeMesh::OpenVolumeMesh)
set_target_properties (simple_mesh PROPERTIES set_target_properties (simple_mesh PROPERTIES
CXX_STANDARD ${OVM_CXX_VERSION} CXX_STANDARD ${OVM_CXX_STANDARD}
CXX_STANDARD_REQUIRED YES CXX_STANDARD_REQUIRED YES
CXX_EXTENSIONS NO CXX_EXTENSIONS NO
) )
......
...@@ -69,7 +69,7 @@ generate_export_header(OpenVolumeMesh ...@@ -69,7 +69,7 @@ generate_export_header(OpenVolumeMesh
set_target_properties (OpenVolumeMesh PROPERTIES set_target_properties (OpenVolumeMesh PROPERTIES
VERSION ${OpenVolumeMesh_VERSION_MAJOR}.${OpenVolumeMesh_VERSION_MINOR} VERSION ${OpenVolumeMesh_VERSION_MAJOR}.${OpenVolumeMesh_VERSION_MINOR}
SOVERSION ${OpenVolumeMesh_VERSION_MAJOR}.${OpenVolumeMesh_VERSION_MINOR} SOVERSION ${OpenVolumeMesh_VERSION_MAJOR}.${OpenVolumeMesh_VERSION_MINOR}
CXX_STANDARD ${OVM_CXX_VERSION} CXX_STANDARD ${OVM_CXX_STANDARD}
CXX_STANDARD_REQUIRED YES CXX_STANDARD_REQUIRED YES
CXX_EXTENSIONS NO CXX_EXTENSIONS NO
POSITION_INDEPENDENT_CODE ON POSITION_INDEPENDENT_CODE ON
......
...@@ -3,7 +3,7 @@ if(Boost_FOUND) ...@@ -3,7 +3,7 @@ if(Boost_FOUND)
add_executable(file_converter ovm_converter.cc) add_executable(file_converter ovm_converter.cc)
set_target_properties (file_converter PROPERTIES set_target_properties (file_converter PROPERTIES
CXX_STANDARD ${OVM_CXX_VERSION} CXX_STANDARD ${OVM_CXX_STANDARD}
CXX_STANDARD_REQUIRED YES CXX_STANDARD_REQUIRED YES
CXX_EXTENSIONS NO CXX_EXTENSIONS NO
) )
......
...@@ -37,7 +37,7 @@ if(GTEST_FOUND) ...@@ -37,7 +37,7 @@ if(GTEST_FOUND)
set_target_properties(${TARGET_NAME} PROPERTIES set_target_properties(${TARGET_NAME} PROPERTIES
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Unittests RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Unittests
CXX_STANDARD ${OVM_CXX_VERSION} CXX_STANDARD ${OVM_CXX_STANDARD}
CXX_STANDARD_REQUIRED YES CXX_STANDARD_REQUIRED YES
CXX_EXTENSIONS NO CXX_EXTENSIONS NO
) )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment