Merge pull request #1176 from Exiv2/0.27_cxx_standard

fix_1163 Require c++98 privately only in library target
5 years ago · 47d89a56bb
parent 6ac5cd1c89 fabfcac274
commit 47d89a56bb
2 changed files with 4 additions and 4 deletions
--- a/cmake/mainSetup.cmake
+++ b/cmake/mainSetup.cmake
@ -18,10 +18,6 @@ if (NOT CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
    set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
 endif()

-set(CMAKE_CXX_STANDARD 98)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS ON)
-
 if (UNIX)
    if (APPLE)
        set(CMAKE_MACOSX_RPATH ON)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@ -91,6 +91,10 @@ generate_export_header(exiv2lib
    STATIC_DEFINE exiv2lib_STATIC
 )

+target_compile_features(exiv2lib_int PRIVATE cxx_std_98)
+target_compile_features(exiv2lib PRIVATE cxx_std_98)
+
+
 # Conditional addition of sources to library targets
 # ---------------------------------------------------------