tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom
nixpkgs / pkgs / development / libraries / lib3mf / upgrade-to-cpp-14.patch
at fix-function-merge 18 lines 672 B view raw
1diff --git a/CMakeLists.txt b/CMakeLists.txt 2index 9f719beb7..a20f84eb8 100644 3--- a/CMakeLists.txt 4+++ b/CMakeLists.txt 5@@ -34,12 +34,12 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") 6 # using GCC 7 add_definitions(-DBUILD_DLL) 8 add_compile_options(-Wall) 9- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O2") 10+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -O2") 11 elseif ("${CMAKE_SYSTEM_NAME}" MATCHES "Darwin") 12 # using GCC 13 add_definitions(-DBUILD_DLL) 14 add_compile_options(-Wall) 15- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O2") 16+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -O2") 17 set(CMAKE_MACOSX_RPATH ON) 18 endif()