1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31
|
Index: actor-framework/CMakeLists.txt
===================================================================
--- actor-framework.orig/CMakeLists.txt
+++ actor-framework/CMakeLists.txt
@@ -193,7 +193,11 @@ math(EXPR CAF_VERSION_PATCH "${VERSION_I
set(CAF_VERSION
"${CAF_VERSION_MAJOR}.${CAF_VERSION_MINOR}.${CAF_VERSION_PATCH}")
# set the library version for our shared library targets
-set(CAF_LIB_VERSION "${CAF_VERSION_MAJOR}.${CAF_VERSION_MINOR}")
+if(CMAKE_HOST_SYSTEM_NAME MATCHES "OpenBSD")
+ set(CAF_LIB_VERSION "${CAF_VERSION_MAJOR}.${CAF_VERSION_MINOR}")
+else()
+ set(CAF_LIB_VERSION "${CAF_VERSION}")
+endif()
################################################################################
# set output paths for binaries and libraries if not provided by the user #
@@ -390,11 +394,11 @@ if (NOT caf_is_subproject)
endif()
# check if the user provided CXXFLAGS, set defaults otherwise
if(NOT CMAKE_CXX_FLAGS)
- set(CMAKE_CXX_FLAGS "-std=c++11 -Wextra -Wall -pedantic")
+ set(CMAKE_CXX_FLAGS "-std=c++14 -Wextra -Wall -pedantic")
endif()
if (NOT MSVC AND NOT "${CMAKE_CXX_FLAGS}" MATCHES "-std=")
message(STATUS "Supplied CXXFLAGS do not contain a C++ standard, setting std to c++11")
- set(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}")
+ set(CMAKE_CXX_FLAGS "-std=c++14 ${CMAKE_CXX_FLAGS}")
endif()
if(NOT CMAKE_CXX_FLAGS_DEBUG)
set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
|