1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
|
From 9a36b15d66c5e340cd8695415ce5867ad07ee2bb Mon Sep 17 00:00:00 2001
From: Volker Enderlein <volkerenderlein@hotmail.com>
Date: Sun, 8 Mar 2020 14:24:29 +0100
Subject: [PATCH] Partially incorporating coin4.0.0a-patch from gentoo
---
CMakeLists.txt | 63 ++++++++++++++++++++++++++------------------------
1 file changed, 33 insertions(+), 30 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 755bd9d59..d23f5bc0e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,8 +1,3 @@
-if (POLICY CMP0054)
- # CMake version 3.14.5 warns when the policy is not set and uses OLD behaviour
- cmake_policy(SET CMP0054 NEW)
-endif()
-
cmake_minimum_required(VERSION 3.0)
set(COIN_MAJOR_VERSION 4)
@@ -22,6 +17,11 @@ math(EXPR COIN_SO_VERSION ${PROJECT_VERSION_MAJOR}*20)
set(PROJECT_DESCRIPTION "A high-level 3D visualization library with Open Inventor 2.1 API")
# ############################################################################
+if(POLICY CMP0054)
+ # CMake version 3.14.5 warns when the policy is not set and uses OLD behaviour
+ cmake_policy(SET CMP0054 NEW)
+endif()
+
if(POLICY CMP0072)
# get rid of OpenGL GLVND warning from CMake 3.11
cmake_policy(SET CMP0072 NEW)
@@ -103,8 +103,8 @@ cmake_dependent_option(COIN_BUILD_MAC_AGL "Build for AGL on Mac OS X when ON. De
report_prepare(
COIN_BUILD_SHARED_LIBS
- COIN_BUILD_TESTS
- COIN_BUILD_DOCUMENTATION
+ COIN_BUILD_TESTS
+ COIN_BUILD_DOCUMENTATION
COIN_BUILD_INTERNAL_DOCUMENTATION
COIN_BUILD_DOCUMENTATION_MAN
COIN_BUILD_DOCUMENTATION_QTHELP
@@ -113,29 +113,29 @@ report_prepare(
HAVE_VRML97
COIN_HAVE_JAVASCRIPT
HAVE_NODEKITS
- HAVE_DRAGGERS
- HAVE_MANIPULATORS
- HAVE_SOUND
+ HAVE_DRAGGERS
+ HAVE_MANIPULATORS
+ HAVE_SOUND
HAVE_3DS_IMPORT_CAPABILITIES
USE_EXTERNAL_EXPAT
- USE_EXCEPTIONS
- USE_SUPERGLU
- FONTCONFIG_RUNTIME_LINKING
- FREETYPE_RUNTIME_LINKING
- LIBBZIP2_RUNTIME_LINKING
- OPENAL_RUNTIME_LINKING
- SIMAGE_RUNTIME_LINKING
- ZLIB_RUNTIME_LINKING
- GLU_RUNTIME_LINKING
- SPIDERMONKEY_RUNTIME_LINKING
- HAVE_MULTIPLE_VERSION
+ USE_EXCEPTIONS
+ USE_SUPERGLU
+ FONTCONFIG_RUNTIME_LINKING
+ FREETYPE_RUNTIME_LINKING
+ LIBBZIP2_RUNTIME_LINKING
+ OPENAL_RUNTIME_LINKING
+ SIMAGE_RUNTIME_LINKING
+ ZLIB_RUNTIME_LINKING
+ GLU_RUNTIME_LINKING
+ SPIDERMONKEY_RUNTIME_LINKING
+ HAVE_MULTIPLE_VERSION
IF_APPLE
- COIN_BUILD_MAC_FRAMEWORK
- COIN_BUILD_MAC_X11
- COIN_BUILD_MAC_AGL
+ COIN_BUILD_MAC_FRAMEWORK
+ COIN_BUILD_MAC_X11
+ COIN_BUILD_MAC_AGL
IF_MSVC
COIN_BUILD_MSVC_STATIC_RUNTIME
- COIN_BUILD_SINGLE_LIB
+ COIN_BUILD_SINGLE_LIB
MSVC_VERSION
COIN_BUILD_MSVC_MP
)
@@ -147,8 +147,8 @@ if(HAVE_MULTIPLE_VERSION)
CMAKE_INSTALL_DATADIR
CMAKE_INSTALL_FULL_DATADIR
CMAKE_INSTALL_INCLUDEDIR
- CMAKE_INSTALL_FULL_INCLUDEDIR
- CMAKE_INSTALL_DOCDIR
+ CMAKE_INSTALL_FULL_INCLUDEDIR
+ CMAKE_INSTALL_DOCDIR
CMAKE_INSTALL_FULL_DOCDIR
)
else()
@@ -534,9 +534,12 @@ else()
if(HAVE_MACH_O_DYLD_H)
check_symbol_exists(NSLookupAndBindSymbol mach-o/dyld.h HAVE_DYLD_RUNTIME_BINDING)
endif()
- check_library_exists(dl dlopen "" HAVE_DL_LIB)
- if(HAVE_DL_LIB)
- check_include_file(dlfcn.h HAVE_DLFCN_H)
+ # On FreeBSD, NetBSD and OpenBSD there is no libdl, as the required
+ # functionality is already built into libc. So use ${CMAKE_DL_LIBS} instead.
+ check_include_file(dlfcn.h HAVE_DLFCN_H)
+ if(HAVE_DLFCN_H)
+ set(HAVE_DL_LIB 1)
+ list(APPEND COIN_TARGET_LINK_LIBRARIES ${CMAKE_DL_LIBS})
endif()
check_library_exists(dld shl_load "" HAVE_DLD_LIB)
endif()
--
2.26.2
|
