From 1bf198cb0f8692113b199c6f131b7f9123a4acc1 Mon Sep 17 00:00:00 2001 From: Jehan Date: Sun, 28 May 2017 15:32:06 +0200 Subject: [PATCH] Make C++11 the standard used for uchardet. As discussed in bug 101032, it seems like the most common usage nowadays. Let's make a specific choice to avoid different behavior on different builds later on. --- src/CMakeLists.txt | 4 ++++ src/tools/CMakeLists.txt | 2 ++ test/CMakeLists.txt | 2 ++ 3 files changed, 8 insertions(+) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 952b594..70034f4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -79,6 +79,8 @@ add_library( ${UCHARDET_LIBRARY} ${UCHARDET_SOURCES} ) +set_property(TARGET ${UCHARDET_LIBRARY} + PROPERTY CXX_STANDARD 11) if (UCHARDET_STATIC_LIBRARY) add_library( @@ -86,6 +88,8 @@ if (UCHARDET_STATIC_LIBRARY) STATIC ${UCHARDET_SOURCES} ) + set_property(TARGET ${UCHARDET_STATIC_LIBRARY} + PROPERTY CXX_STANDARD 11) endif (UCHARDET_STATIC_LIBRARY) set_target_properties( diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt index fa15eb2..ca4e765 100644 --- a/src/tools/CMakeLists.txt +++ b/src/tools/CMakeLists.txt @@ -9,6 +9,8 @@ add_executable( ${UCHARDET_BINARY} ${UCHARDET_SOURCES} ) +set_property(TARGET ${UCHARDET_BINARY} + PROPERTY CXX_STANDARD 11) target_link_libraries( ${UCHARDET_BINARY} diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index a059044..565c0e7 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -7,6 +7,8 @@ add_executable( uchardet-tests ${UCHARDET_TEST_SOURCES} ) +set_property(TARGET uchardet-tests + PROPERTY CXX_STANDARD 11) target_link_libraries( uchardet-tests