diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
index 7628110d..f7c3e2a3 100644
--- a/samples/CMakeLists.txt
+++ b/samples/CMakeLists.txt
@@ -120,6 +120,7 @@ list(APPEND APPLICATIONS remotetest)
 # ******************************************************************************
 foreach(application ${APPLICATIONS})
     target_link_libraries(${application} PRIVATE exiv2lib)
+    target_compile_features(${application} PRIVATE cxx_std_98)
     if( EXIV2_ENABLE_PNG )
         target_link_libraries( ${application} PRIVATE ${ZLIB_LIBRARIES} )
     endif()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 46aff5e3..29bbf50e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -256,6 +256,7 @@ if(EXIV2_BUILD_EXIV2_COMMAND)
          getopt.cpp getopt.hpp
          utils.cpp utils.hpp
     )
+    target_compile_features(exiv2 PRIVATE cxx_std_98)
 
     set_target_properties( exiv2 PROPERTIES
         COMPILE_FLAGS ${EXTRA_COMPILE_FLAGS}
diff --git a/unitTests/CMakeLists.txt b/unitTests/CMakeLists.txt
index 55104533..7e246a44 100644
--- a/unitTests/CMakeLists.txt
+++ b/unitTests/CMakeLists.txt
@@ -17,8 +17,8 @@ foreach(source IN LISTS exiv2lib_SOURCES exiv2lib_int_SOURCES)
     endif()
 endforeach()
 
-add_executable(unit_tests mainTestRunner.cpp
-    gtestwrapper.h
+add_executable(unit_tests
+    mainTestRunner.cpp
     test_DateValue.cpp
     test_TimeValue.cpp
     test_XmpKey.cpp
@@ -33,6 +33,7 @@ add_executable(unit_tests mainTestRunner.cpp
     test_slice.cpp
     test_tiffheader.cpp
     test_types.cpp
+    gtestwrapper.h
     ${unit_tests_exiv2lib_SOURCES}
 )
 
@@ -41,6 +42,7 @@ target_compile_definitions(unit_tests
     exiv2lib_STATIC
     TESTDATA_PATH="${PROJECT_SOURCE_DIR}/test/data"
 )
+target_compile_features(unit_tests PRIVATE cxx_std_98)
 
 if (exiv2lib_COMPILE_DEFINITIONS)
     target_compile_definitions(unit_tests PRIVATE ${exiv2lib_COMPILE_DEFINITIONS})