diff --git a/CHANGELOG.md b/CHANGELOG.md index f8d6d3b8..30aed888 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,10 @@ Fixed * Exception messages. * Null pointer handling. +Removed +------- +* `ARILES_CPP_STANDARD` cmake option. + 2.1.0 ===== diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ad4332a..6d332d87 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,7 +30,6 @@ option (ARILES_VERBOSE "Verbose build" ON) option (ARILES_BUILD_REGRESSION_TESTS "Build regression tests." ON) option (ARILES_CCACHE "Enable ccache if available" ON) set (ARILES_DEB_TARGETS "" CACHE STRING "Enable debian package generation.") -set (ARILES_CPP_STANDARD "17" CACHE STRING "must not be older than 17") # install parameters set (ARILES_PKGCONFIG_INSTALL_PATH "" CACHE STRING "pkg-config pc-file install path, not installed if empty") @@ -210,10 +209,12 @@ set(CMAKEUT_CPP_SANITIZERS ${ARILES_CPP_SANITIZERS}) set(CMAKEUT_CLANG_TIDY ${ARILES_CPP_CLANG_TIDY}) set(CMAKEUT_CLANG_TIDY_EXTRA_IGNORES "-cppcoreguidelines-special-member-functions,-hicpp-special-member-functions,-altera-struct-pack-align,-llvm-namespace-comment,-misc-no-recursion,-readability-const-return-type,-google-default-arguments,-bugprone-macro-parentheses,-cppcoreguidelines-pro-type-union-access,-hicpp-named-parameter,-readability-named-parameter,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-cppcoreguidelines-pro-type-union-access,-cppcoreguidelines-avoid-non-const-global-variables,-cert-err58-cpp,-cert-env33-c") -cmakeut_compiler_flags("c++${ARILES_CPP_STANDARD}") +set(CMAKE_CXX_STANDARD "17") +cmakeut_compiler_flags("c++${CMAKE_CXX_STANDARD}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKEUT_CXX_FLAGS}") + set (RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin") set (LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib") set (ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib")