[Looks like the latest release of gdcm not only fixed the build with

newer versions of poppler, but also broke it at the same time again
by enforcing C++98, which also appears to break the build on powerpc.

Remove the cmake bits, as upstream plans to switch to C++11 anyways.

ok jasper@
This commit is contained in:
kili 2017-11-28 20:47:12 +00:00
parent f91080d036
commit 02245f8817

View File

@ -1,11 +1,23 @@
$OpenBSD: patch-CMakeLists_txt,v 1.2 2017/11/10 09:48:38 jasper Exp $
$OpenBSD: patch-CMakeLists_txt,v 1.3 2017/11/28 20:47:12 kili Exp $
Revert commit 966ca7e5d00a4b0bba5d6d9392303231e4e4e536 from upstream
(enforcing c++98), because it breaks builds with newer poppler.
Unbreak build: we don't provide library symlinks
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -116,7 +116,11 @@ else()
@@ -15,8 +15,6 @@ if( POLICY CMP0063 )
cmake_policy(SET CMP0063 NEW)
endif()
project(GDCM)
-set(CMAKE_CXX_STANDARD 98)
-set(CMAKE_CXX_EXTENSIONS OFF)
mark_as_advanced(CMAKE_BACKWARDS_COMPATIBILITY CMAKE_BUILD_TYPE CMAKE_INSTALL_PREFIX)
set(GDCM_CMAKE_DIR "${GDCM_SOURCE_DIR}/CMake" CACHE INTERNAL "")
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${GDCM_CMAKE_DIR}")
@@ -116,7 +114,11 @@ else()
endif()
if(BUILD_SHARED_LIBS)