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
|
diff -ruN Coin3D-coin-a4ce638f43bd/CMakeLists.txt my/CMakeLists.txt
--- Coin3D-coin-a4ce638f43bd/CMakeLists.txt 2019-11-09 14:39:34.000000000 +0100
+++ my/CMakeLists.txt 2019-11-21 00:19:43.563521948 +0100
@@ -97,8 +97,8 @@
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
@@ -107,29 +107,29 @@
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
)
@@ -141,8 +141,8 @@
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()
@@ -165,7 +165,7 @@
list(APPEND COIN_TARGET_LINK_LIBRARIES Boost::boost)
endif()
-if(COIN_BUILD_MAC_X11)
+if(COIN_BUILD_MAC_X11 OR UNIX)
find_package(X11 REQUIRED)
# On Mac OS X, GLX is provided as a separate OpenGL implementation, different
# from the standard OpenGL framework which provides support for GLUT and native
@@ -530,6 +530,7 @@
endif()
check_library_exists(dl dlopen "" HAVE_DL_LIB)
if(HAVE_DL_LIB)
+ list(APPEND COIN_TARGET_LINK_LIBRARIES dl)
check_include_file(dlfcn.h HAVE_DLFCN_H)
endif()
check_library_exists(dld shl_load "" HAVE_DLD_LIB)
@@ -815,4 +816,4 @@
# ############################################################################
# New CPACK section, please see the README file inside cpack.d directory.
-add_subdirectory(cpack.d)
+# not needed add_subdirectory(cpack.d)
|
GitWeb