diff options
author | Jeff Trull <edaskel@att.net> | 2019-05-31 12:25:55 -0700 |
---|---|---|
committer | Murray Cumming <murrayc@murrayc.com> | 2019-06-03 15:30:26 +0200 |
commit | ec1b7ca2494dfafe3098d1665a09a2dd0dc65f5e (patch) | |
tree | 47d7dd9d9733eff53a4e04f4b09b1758ba8c1c98 | |
parent | 6447d24e00adff4b1a6922df2fe09933a742fe20 (diff) | |
download | sigc++-ec1b7ca2494dfafe3098d1665a09a2dd0dc65f5e.tar.gz |
CMake: supply SIGC_BUILD and use CMAKE_CXX_STANDARD, for MSVC
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | sigc++/CMakeLists.txt | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index bd03769..9ec2b4a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,7 @@ option (SIGCXX_DISABLE_DEPRECATED "Disable deprecated" OFF) project (sigc++) -set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17") +set( CMAKE_CXX_STANDARD 17 ) set (PROJECT_SOURCE_DIR "${sigc++_SOURCE_DIR}/sigc++") diff --git a/sigc++/CMakeLists.txt b/sigc++/CMakeLists.txt index c06d829..fa5a91a 100644 --- a/sigc++/CMakeLists.txt +++ b/sigc++/CMakeLists.txt @@ -27,6 +27,7 @@ add_library(${SIGCPP_LIB_NAME} SHARED ${SOURCE_FILES}) set_property (TARGET ${SIGCPP_LIB_NAME} PROPERTY VERSION ${PACKAGE_VERSION}) set_property(TARGET ${SIGCPP_LIB_NAME} PROPERTY SOVERSION ${LIBSIGCPP_SOVERSION}) +target_compile_definitions( ${SIGCPP_LIB_NAME} PRIVATE -DSIGC_BUILD ) set (INCLUDE_INSTALL_DIR "include/${PROJECT_NAME}-${SIGCXX_API_VERSION}") |