From 7d3b049fba641d1a4de29d8684b31a215f5c7445 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Mon, 10 Apr 2017 19:39:08 -0500 Subject: [PATCH] Assume long long support by default (don't rely on fancy CMake CXX_STANDARD) --- CMakeLists.txt | 6 ------ src/pugixml/pugiconfig.hpp | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2dc30a21d4..19d2d3886b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -235,12 +235,6 @@ endif() #=============================================================================== add_library(pugixml src/pugixml/pugixml_c.cpp src/pugixml/pugixml.cpp) -if(CMAKE_VERSION VERSION_LESS 3.1) - target_compile_options(pugixml PRIVATE -std=c++11) -else() - set_property(TARGET pugixml PROPERTY CXX_STANDARD 11) -endif() - add_library(pugixml_fortran src/pugixml/pugixml_f.F90) target_link_libraries(pugixml_fortran pugixml) diff --git a/src/pugixml/pugiconfig.hpp b/src/pugixml/pugiconfig.hpp index 2d1e6aa8b0..2f1027aa38 100644 --- a/src/pugixml/pugiconfig.hpp +++ b/src/pugixml/pugiconfig.hpp @@ -44,7 +44,7 @@ // #define PUGIXML_HEADER_ONLY // Uncomment this to enable long long support -// #define PUGIXML_HAS_LONG_LONG +#define PUGIXML_HAS_LONG_LONG #endif