33 lines
1.1 KiB
Plaintext
33 lines
1.1 KiB
Plaintext
$OpenBSD: patch-CMakeLists_txt,v 1.4 2018/11/14 19:37:05 jasper 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
|
|
@@ -18,8 +18,6 @@ if( POLICY CMP0074 )
|
|
cmake_policy(SET CMP0074 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}")
|
|
@@ -119,7 +117,11 @@ else()
|
|
endif()
|
|
|
|
if(BUILD_SHARED_LIBS)
|
|
-if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.6)
|
|
+# OpenBSD doesn't have library symlinks
|
|
+if(CMAKE_SYSTEM_NAME MATCHES OpenBSD)
|
|
+ set(NAMELINK_ONLY)
|
|
+ set(NAMELINK_SKIP)
|
|
+elseif(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.6)
|
|
set(NAMELINK_ONLY NAMELINK_ONLY)
|
|
set(NAMELINK_SKIP NAMELINK_SKIP)
|
|
else()
|