diff options
| author | Jérôme Martinez <jerome@mediaarea.net> | 2022-03-27 14:50:48 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-27 14:50:48 +0300 |
| commit | 5fe5d611141e720edecff87e51a2d4d0ad0586b1 (patch) | |
| tree | 391d8236373fbb14ee77fc615aa39e0dee7e8062 | |
| parent | b9f8e50d3a67c7fe8f0597c6f720ebd87f777b9e (diff) | |
| parent | d330c224f00f7d492f1da400d8b30a92bca96dc0 (diff) | |
Merge pull request #134 from g-maxime/c++11
Enable C++11
| -rw-r--r-- | Project/CMake/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | Project/GNU/Library/Makefile.am | 1 | ||||
| -rw-r--r-- | Project/Qt/ZenLib.pro | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/Project/CMake/CMakeLists.txt b/Project/CMake/CMakeLists.txt index 51f5635..8d0e9e8 100644 --- a/Project/CMake/CMakeLists.txt +++ b/Project/CMake/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required(VERSION 3.1.0)
project(ZenLib)
@@ -151,6 +151,9 @@ set_target_properties(zen PROPERTIES VERSION ${ZenLib_VERSION}
SOVERSION ${ZenLib_MAJOR_VERSION}
PUBLIC_HEADER "${ZenLib_HDRS}"
+ CXX_STANDARD 11
+ CXX_EXTENSIONS NO
+ CXX_STANDARD_REQUIRED YES
)
install(TARGETS zen EXPORT zen-export
diff --git a/Project/GNU/Library/Makefile.am b/Project/GNU/Library/Makefile.am index 2187ee7..c3366e8 100644 --- a/Project/GNU/Library/Makefile.am +++ b/Project/GNU/Library/Makefile.am @@ -78,4 +78,5 @@ zen_format_http_HEADERS = \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libzen.pc +AM_CXXFLAGS = -std=c++11 AM_CPPFLAGS = -I../../../Source diff --git a/Project/Qt/ZenLib.pro b/Project/Qt/ZenLib.pro index 7fecc8e..3189b03 100644 --- a/Project/Qt/ZenLib.pro +++ b/Project/Qt/ZenLib.pro @@ -2,10 +2,9 @@ # in order to build with qmake just copy this file to the sources # then open with QtCreator and build TEMPLATE = lib -CONFIG += staticlib +CONFIG += staticlib c++11 TARGET = zen INCLUDEPATH += . .. HTTP_Client - QMAKE_CXXFLAGS += -D_UNICODE # surpressing way too many warnings here, with a heavy sigh |