lib3mf: Apply patch to support C++14.
This commit is contained in:
parent
a331a49cf7
commit
f618da6e79
|
@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "sha256-WMTTYYgpCIM86a6Jw8iah/YVXN9T5youzEieWL/d+Bc=";
|
sha256 = "sha256-WMTTYYgpCIM86a6Jw8iah/YVXN9T5youzEieWL/d+Bc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [ ./upgrade-to-cpp-14.patch ];
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ninja pkg-config ];
|
nativeBuildInputs = [ cmake ninja pkg-config ];
|
||||||
|
|
||||||
outputs = [ "out" "dev" ];
|
outputs = [ "out" "dev" ];
|
||||||
|
|
18
pkgs/development/libraries/lib3mf/upgrade-to-cpp-14.patch
Normal file
18
pkgs/development/libraries/lib3mf/upgrade-to-cpp-14.patch
Normal file
|
@ -0,0 +1,18 @@
|
||||||
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
|
index 9f719beb7..a20f84eb8 100644
|
||||||
|
--- a/CMakeLists.txt
|
||||||
|
+++ b/CMakeLists.txt
|
||||||
|
@@ -34,12 +34,12 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
|
||||||
|
# using GCC
|
||||||
|
add_definitions(-DBUILD_DLL)
|
||||||
|
add_compile_options(-Wall)
|
||||||
|
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O2")
|
||||||
|
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -O2")
|
||||||
|
elseif ("${CMAKE_SYSTEM_NAME}" MATCHES "Darwin")
|
||||||
|
# using GCC
|
||||||
|
add_definitions(-DBUILD_DLL)
|
||||||
|
add_compile_options(-Wall)
|
||||||
|
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O2")
|
||||||
|
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -O2")
|
||||||
|
set(CMAKE_MACOSX_RPATH ON)
|
||||||
|
endif()
|
Loading…
Reference in New Issue
Block a user