Context Navigation

← Previous Changeset
Next Changeset →

Changeset 9949

Timestamp:

03/23/09 17:01:02 (4 years ago)

Author:

robert

Message:

From Philip Lowman, "Here's the promised cleanup of the OSG's CMakeLists.txt files for the src/ folder. I'll submit the others separately.

Also, there was also a small bug in osgDB's CMakeLists.txt that was causing an error when I tested with CMake 2.4.4.

IF(${OSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX} STREQUAL "quicktime")
was changed to
IF(OSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX STREQUAL "quicktime")
"

Location:

OpenSceneGraph/trunk/src

Files:

: 23 modified

CMakeLists.txt (modified) (1 diff)
OpenThreads/CMakeLists.txt (modified) (4 diffs)
OpenThreads/pthreads/CMakeLists.txt (modified) (6 diffs)
OpenThreads/sproc/CMakeLists.txt (modified) (1 diff)
OpenThreads/win32/CMakeLists.txt (modified) (2 diffs)
osg/CMakeLists.txt (modified) (2 diffs)
osgAnimation/CMakeLists.txt (modified) (1 diff)
osgDB/CMakeLists.txt (modified) (2 diffs)
osgFX/CMakeLists.txt (modified) (1 diff)
osgGA/CMakeLists.txt (modified) (1 diff)
osgIntrospection/CMakeLists.txt (modified) (1 diff)
osgManipulator/CMakeLists.txt (modified) (1 diff)
osgParticle/CMakeLists.txt (modified) (1 diff)
osgPlugins/CMakeLists.txt (modified) (6 diffs)
osgShadow/CMakeLists.txt (modified) (1 diff)
osgSim/CMakeLists.txt (modified) (1 diff)
osgTerrain/CMakeLists.txt (modified) (1 diff)
osgText/CMakeLists.txt (modified) (1 diff)
osgUtil/CMakeLists.txt (modified) (1 diff)
osgViewer/CMakeLists.txt (modified) (7 diffs)
osgVolume/CMakeLists.txt (modified) (1 diff)
osgWidget/CMakeLists.txt (modified) (1 diff)
osgWrappers/CMakeLists.txt (modified) (7 diffs)

Legend:

: Unmodified
: Added
: Removed

OpenSceneGraph/trunk/src/CMakeLists.txt

r9213	r9949
20	20	)
21	21
22		ADD_SUBDIRECTORY(${mylibfolder})
	22	ADD_SUBDIRECTORY(${mylibfolder})
23	23
24		ENDFOREACH( ~~mylibfolder~~ )
	24	ENDFOREACH()
25	25
26	26
27	27	OPTION(BUILD_OSG_WRAPPERS "Enable to build Introspection and Wrappers" OFF)
28		IF (BUILD_OSG_WRAPPERS)
	28	IF(BUILD_OSG_WRAPPERS)
29	29	ADD_SUBDIRECTORY(osgIntrospection)
30	30	ADD_SUBDIRECTORY(osgWrappers)
31		ENDIF(~~BUILD_OSG_WRAPPERS~~)
	31	ENDIF()
32	32
33	33	IF(MSVC80)
34	34	OPTION(OSG_MSVC_GENERATE_PLUGINS_AND_WRAPPERS_MANIFESTS "Generate or not manifests files under VS8 for dynamically loaded dlls" ON)
35		ENDIF(~~MSVC80~~)
	35	ENDIF()
36	36

OpenSceneGraph/trunk/src/OpenThreads/CMakeLists.txt

r9794	r9949
14	14	# User Options
15	15	OPTION(DYNAMIC_OPENTHREADS "Set to ON to build OpenThreads for dynamic linking. Use OFF for static." ON)
16		IF (DYNAMIC_OPENTHREADS)
	16	IF(DYNAMIC_OPENTHREADS)
17	17	SET(OPENTHREADS_USER_DEFINED_DYNAMIC_OR_STATIC "SHARED")
18		ELSE ~~(DYNAMIC_OPENTHREADS~~)
	18	ELSE()
19	19	SET(OPENTHREADS_USER_DEFINED_DYNAMIC_OR_STATIC "STATIC")
20	20	SET(OT_LIBRARY_STATIC 1)
21		ENDIF ~~(DYNAMIC_OPENTHREADS~~)
	21	ENDIF()
22	22
23	23	################################################################################
…	…
36	36	CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/PlatformSpecifics/Windows/OpenThreadsVersionInfo.rc.in"
37	37	"${OPENTHREADS_VERSIONINFO_RC}")
38		ENDIF(~~MSVC~~)
	38	ENDIF()
39	39
40	40
…	…
67	67	# In this case, only Sproc exists, so no option.
68	68	SET(OPENTHREADS_USE_SPROC_INSTEAD_OF_PTHREADS 1)
69		ELSE(~~CMAKE_USE_SPROC_INIT~~)
	69	ELSE()
70	70	IF(CMAKE_HAVE_SPROC_H)
71	71	OPTION(OPENTHREADS_USE_SPROC_INSTEAD_OF_PTHREADS "Set to ON to build OpenThreads against sproc instead of pthreads" OFF)
72		ENDIF(~~CMAKE_HAVE_SPROC_H~~)
73		ENDIF(~~CMAKE_USE_SPROC_INIT~~)
	72	ENDIF()
	73	ENDIF()
74	74	ENDIF(CMAKE_SYSTEM MATCHES IRIX)
75	75
…	…
79	79	IF(CYGWIN)
80	80	SUBDIRS(pthreads)
81		ELSE(~~CYGWIN~~)
	81	ELSE()
82	82	# Everybody else including Msys should probably go here
83	83	SUBDIRS(win32)
84	84	# examples)
85		ENDIF(~~CYGWIN~~)
86		ELSE(~~WIN32~~)
	85	ENDIF()
	86	ELSE()
87	87	IF(UNIX)
88	88	IF(OPENTHREADS_USE_SPROC_INSTEAD_OF_PTHREADS)
89	89	SUBDIRS(sproc)
90		ELSE(~~OPENTHREADS_USE_SPROC_INSTEAD_OF_PTHREADS~~)
	90	ELSE()
91	91	SUBDIRS(pthreads)
92		ENDIF(~~OPENTHREADS_USE_SPROC_INSTEAD_OF_PTHREADS~~)
93		ELSE(~~UNIX~~)
	92	ENDIF()
	93	ELSE()
94	94	MESSAGE("Sorry, OpenThreads may not support your platform")
95		ENDIF(~~UNIX~~)
96		ENDIF(~~WIN32~~)
	95	ENDIF()
	96	ENDIF()
97	97
98	98	# Make sure everyone can find Config

OpenSceneGraph/trunk/src/OpenThreads/pthreads/CMakeLists.txt

r9359	r9949
26	26	IF(OPENTHREADS_SONAMES)
27	27	SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES VERSION ${OPENTHREADS_VERSION} SOVERSION ${OPENTHREADS_SOVERSION})
28		ENDIF(~~OPENTHREADS_SONAMES~~)
	28	ENDIF()
29	29
30	30	SET(CMAKE_REQUIRED_LIBRARIES_SAFE "${CMAKE_REQUIRED_LIBRARIES}")
…	…
34	34	IF(HAVE_PTHREAD_YIELD)
35	35	ADD_DEFINITIONS(-DHAVE_PTHREAD_YIELD)
36		ELSE(~~HAVE_PTHREAD_YIELD~~)
	36	ELSE()
37	37	# sched_yield appears not in libc, pthreads or whatever on some systems
38	38	CHECK_FUNCTION_EXISTS(sched_yield HAVE_SCHED_YIELD)
…	…
41	41	IF(HAVE_SCHED_YIELD)
42	42	SET(CMAKE_THREAD_LIBS_INIT "${CMAKE_THREAD_LIBS_INIT} -lrt")
43		ENDIF(~~HAVE_SCHED_YIELD~~)
44		ENDIF(~~NOT HAVE_SCHED_YIELD~~)
	43	ENDIF()
	44	ENDIF()
45	45	IF(HAVE_SCHED_YIELD)
46	46	ADD_DEFINITIONS(-DHAVE_SCHED_YIELD)
47		ENDIF(~~HAVE_SCHED_YIELD~~)
48		ENDIF(~~HAVE_PTHREAD_YIELD~~)
	47	ENDIF()
	48	ENDIF()
49	49
50	50	IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
…	…
52	52	ADD_DEFINITIONS(-D_GNU_SOURCE)
53	53	SET(CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS} -D_GNU_SOURCE")
54		ENDIF(~~${CMAKE_SYSTEM_NAME} MATCHES "Linux"~~)
	54	ENDIF()
55	55
56	56	CHECK_FUNCTION_EXISTS(pthread_setconcurrency HAVE_PTHREAD_SETCONCURRENCY)
57	57	IF(HAVE_PTHREAD_SETCONCURRENCY)
58	58	ADD_DEFINITIONS(-DHAVE_PTHREAD_SETCONCURRENCY)
59		ENDIF(~~HAVE_PTHREAD_SETCONCURRENCY~~)
	59	ENDIF()
60	60
61	61	CHECK_FUNCTION_EXISTS(pthread_getconcurrency HAVE_PTHREAD_GETCONCURRENCY)
62	62	IF(HAVE_PTHREAD_GETCONCURRENCY)
63	63	ADD_DEFINITIONS(-DHAVE_PTHREAD_GETCONCURRENCY)
64		ENDIF(~~HAVE_PTHREAD_GETCONCURRENCY~~)
	64	ENDIF()
65	65
66	66	CHECK_FUNCTION_EXISTS(pthread_setaffinity_np HAVE_PTHREAD_SETAFFINITY_NP)
67	67	IF(HAVE_PTHREAD_SETAFFINITY_NP)
68	68	ADD_DEFINITIONS(-DHAVE_PTHREAD_SETAFFINITY_NP)
69		ELSE(~~HAVE_PTHREAD_SETAFFINITY_NP~~)
	69	ELSE()
70	70	CHECK_CXX_SOURCE_COMPILES("
71	71	#include <sched.h>
…	…
77	77	IF(HAVE_THREE_PARAM_SCHED_SETAFFINITY)
78	78	ADD_DEFINITIONS(-DHAVE_THREE_PARAM_SCHED_SETAFFINITY)
79		ELSE(~~HAVE_THREE_PARAM_SCHED_SETAFFINITY~~)
	79	ELSE()
80	80	CHECK_CXX_SOURCE_COMPILES("
81	81	#include <sched.h>
…	…
87	87	IF(HAVE_TWO_PARAM_SCHED_SETAFFINITY)
88	88	ADD_DEFINITIONS(-DHAVE_TWO_PARAM_SCHED_SETAFFINITY)
89		ENDIF(~~HAVE_TWO_PARAM_SCHED_SETAFFINITY~~)
90		ENDIF(~~HAVE_THREE_PARAM_SCHED_SETAFFINITY~~)
91		ENDIF(~~HAVE_PTHREAD_SETAFFINITY_NP~~)
	89	ENDIF()
	90	ENDIF()
	91	ENDIF()
92	92
93	93	SET(CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES_SAFE}")

OpenSceneGraph/trunk/src/OpenThreads/sproc/CMakeLists.txt

r9359	r9949
24	24	IF(OPENTHREADS_SONAMES)
25	25	SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES VERSION ${OPENTHREADS_VERSION} SOVERSION ${OPENTHREADS_SOVERSION})
26		ENDIF(~~OPENTHREADS_SONAMES~~)
	26	ENDIF()
27	27
28	28	# Do we need to link against anything for Sproc?

OpenSceneGraph/trunk/src/OpenThreads/win32/CMakeLists.txt

r9677	r9949
28	28	IF(OPENTHREADS_SONAMES)
29	29	SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES VERSION ${OPENTHREADS_VERSION} SOVERSION ${OPENTHREADS_SOVERSION})
30		ENDIF(~~OPENTHREADS_SONAMES~~)
	30	ENDIF()
31	31
32	32	# Since we're building different platforms binaries in
…	…
39	39	IF(MSVC AND OSG_MSVC_VERSIONED_DLL)
40	40	HANDLE_MSVC_DLL(ot ${OPENTHREADS_SOVERSION})
41		ENDIF(~~MSVC AND OSG_MSVC_VERSIONED_DLL~~)
	41	ENDIF()
42	42
43	43	INSTALL(

OpenSceneGraph/trunk/src/osg/CMakeLists.txt

r9827	r9949
1	1
2	2	# FIXME: For OS X, need flag for Framework or dylib
3		IF (DYNAMIC_OPENSCENEGRAPH)
	3	IF(DYNAMIC_OPENSCENEGRAPH)
4	4	ADD_DEFINITIONS(-DOSG_LIBRARY)
5		ELSE ~~(DYNAMIC_OPENSCENEGRAPH~~)
	5	ELSE()
6	6	ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
7		ENDIF(~~DYNAMIC_OPENSCENEGRAPH~~)
	7	ENDIF()
8	8
9	9	SET(LIB_NAME osg)
…	…
16	16	IF(OSG_FORCE_QUERY_RESULT_AVAILABLE_BEFORE_RETRIEVAL)
17	17	ADD_DEFINITIONS(-DFORCE_QUERY_RESULT_AVAILABLE_BEFORE_RETRIEVAL)
18		ENDIF(~~OSG_FORCE_QUERY_RESULT_AVAILABLE_BEFORE_RETRIEVAL~~)
	18	ENDIF()
19	19
20	20

OpenSceneGraph/trunk/src/osgAnimation/CMakeLists.txt

r9877	r9949
1	1
2		IF (DYNAMIC_OPENSCENEGRAPH)
	2	IF(DYNAMIC_OPENSCENEGRAPH)
3	3	ADD_DEFINITIONS(-DOSGANIMATION_LIBRARY)
4		ELSE ~~(DYNAMIC_OPENSCENEGRAPH~~)
	4	ELSE()
5	5	ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
6		ENDIF(~~DYNAMIC_OPENSCENEGRAPH~~)
	6	ENDIF()
7	7
8	8	SET(LIB_NAME osgAnimation)

OpenSceneGraph/trunk/src/osgDB/CMakeLists.txt

r9922	r9949
1	1
2		IF (DYNAMIC_OPENSCENEGRAPH)
	2	IF(DYNAMIC_OPENSCENEGRAPH)
3	3	ADD_DEFINITIONS(-DOSGDB_LIBRARY)
4	4
5	5	# Add a default plugin search path component
6	6	ADD_DEFINITIONS(-DOSG_DEFAULT_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX}/lib${LIB_POSTFIX}/${OSG_PLUGINS})
7		ELSE ~~(DYNAMIC_OPENSCENEGRAPH~~)
	7	ELSE()
8	8	ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
9		ENDIF(~~DYNAMIC_OPENSCENEGRAPH~~)
	9	ENDIF()
10	10
11	11
…	…
80	80	SET(OSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX "quicktime" CACHE STRING "standard image plugin for os x, options are quicktime, imageio")
81	81
82
83		IF(${OSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX} STREQUAL "quicktime")
	82	IF(OSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX STREQUAL "quicktime")
84	83	ADD_DEFINITIONS(-DDARWIN_QUICKTIME)
85		ELSE(~~${OSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX} STREQUAL "quicktime"~~)
	84	ELSE()
86	85	ADD_DEFINITIONS(-DDARWIN_IMAGEIO)
87		ENDIF(${OSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX} STREQUAL "quicktime")
88
89		ENDIF(APPLE)
	86	ENDIF()
	87	ENDIF()
90	88
91	89	IF(QUICKTIME_FOUND)
92	90	ADD_DEFINITIONS(-DUSE_QUICKTIME)
93		ENDIF(~~QUICKTIME_FOUND~~)
	91	ENDIF()
94	92
95	93	IF(XINE_FOUND)
96		ADD_DEFINITIONS(-DUSE_XINE)
97		ENDIF(~~XINE_FOUND~~)
	94	ADD_DEFINITIONS(-DUSE_XINE)
	95	ENDIF()
98	96
99	97	IF(INVENTOR_FOUND)
100		ADD_DEFINITIONS(-DUSE_INVENTOR)
101		ENDIF(~~INVENTOR_FOUND~~)
	98	ADD_DEFINITIONS(-DUSE_INVENTOR)
	99	ENDIF()
102	100
103	101	IF(OPENVRML_FOUND)
104		ADD_DEFINITIONS(-DUSE_VRML)
105		ENDIF(~~OPENVRML_FOUND~~)
	102	ADD_DEFINITIONS(-DUSE_VRML)
	103	ENDIF()
106	104
107	105

OpenSceneGraph/trunk/src/osgFX/CMakeLists.txt

r9671	r9949
1	1
2		IF (DYNAMIC_OPENSCENEGRAPH)
	2	IF(DYNAMIC_OPENSCENEGRAPH)
3	3	ADD_DEFINITIONS(-DOSGFX_LIBRARY)
4		ELSE ~~(DYNAMIC_OPENSCENEGRAPH~~)
	4	ELSE()
5	5	ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
6		ENDIF(~~DYNAMIC_OPENSCENEGRAPH~~)
	6	ENDIF()
7	7
8	8	SET(LIB_NAME osgFX)

OpenSceneGraph/trunk/src/osgGA/CMakeLists.txt

r9671	r9949
1	1
2		IF (DYNAMIC_OPENSCENEGRAPH)
	2	IF(DYNAMIC_OPENSCENEGRAPH)
3	3	ADD_DEFINITIONS(-DOSGGA_LIBRARY)
4		ELSE ~~(DYNAMIC_OPENSCENEGRAPH~~)
	4	ELSE()
5	5	ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
6		ENDIF(~~DYNAMIC_OPENSCENEGRAPH~~)
	6	ENDIF()
7	7
8	8	SET(LIB_NAME osgGA)

OpenSceneGraph/trunk/src/osgIntrospection/CMakeLists.txt

r9671	r9949
1	1
2		IF (DYNAMIC_OPENSCENEGRAPH)
	2	IF(DYNAMIC_OPENSCENEGRAPH)
3	3	ADD_DEFINITIONS(-DOSGINTROSPECTION_LIBRARY)
4		ELSE ~~(DYNAMIC_OPENSCENEGRAPH~~)
	4	ELSE()
5	5	ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
6		ENDIF(~~DYNAMIC_OPENSCENEGRAPH~~)
	6	ENDIF()
7	7
8	8	SET(LIB_NAME osgIntrospection)

OpenSceneGraph/trunk/src/osgManipulator/CMakeLists.txt

r9671	r9949
1	1
2		IF (DYNAMIC_OPENSCENEGRAPH)
	2	IF(DYNAMIC_OPENSCENEGRAPH)
3	3	ADD_DEFINITIONS(-DOSGMANIPULATOR_LIBRARY)
4		ELSE ~~(DYNAMIC_OPENSCENEGRAPH~~)
	4	ELSE()
5	5	ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
6		ENDIF(~~DYNAMIC_OPENSCENEGRAPH~~)
	6	ENDIF()
7	7
8	8	SET(LIB_NAME osgManipulator)

OpenSceneGraph/trunk/src/osgParticle/CMakeLists.txt

r9671	r9949
1	1
2		IF (DYNAMIC_OPENSCENEGRAPH)
	2	IF(DYNAMIC_OPENSCENEGRAPH)
3	3	ADD_DEFINITIONS(-DOSGPARTICLE_LIBRARY)
4		ELSE ~~(DYNAMIC_OPENSCENEGRAPH~~)
	4	ELSE()
5	5	ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
6		ENDIF(~~DYNAMIC_OPENSCENEGRAPH~~)
	6	ENDIF()
7	7
8	8	SET(LIB_NAME osgParticle)

OpenSceneGraph/trunk/src/osgPlugins/CMakeLists.txt

r9880	r9949
7	7	PROJECT(OSG_PLUGINS_MASTER)
8	8
9		IF (NOT DYNAMIC_OPENSCENEGRAPH)
	9	IF(NOT DYNAMIC_OPENSCENEGRAPH)
10	10	ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
11		ENDIF(~~NOT DYNAMIC_OPENSCENEGRAPH~~)
	11	ENDIF()
12	12
13	13	IF(NOT MSVC)
14	14	SET(LIBRARY_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH}/${OSG_PLUGINS}")
15	15	SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${OSG_PLUGINS}")
16		ENDIF(~~NOT MSVC~~)
	16	ENDIF()
17	17
18	18	SET(CMAKE_SHARED_MODULE_PREFIX ${OSG_PLUGIN_PREFIX})
19	19
20	20	IF(MSVC80)
21		IF(NOT OSG_MSVC_GENERATE_PLUGINS_AND_WRAPPERS_MANIFESTS)
22		SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /MANIFEST:NO")
23		~~ENDIF(NOT OSG_MSVC_GENERATE_PLUGINS_AND_WRAPPERS_MANIFESTS~~)
24		ENDIF(~~MSVC80~~)
	21	IF(NOT OSG_MSVC_GENERATE_PLUGINS_AND_WRAPPERS_MANIFESTS)
	22	SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /MANIFEST:NO")
	23	ENDIF()
	24	ENDIF()
25	25
26	26	SET(TARGET_DEFAULT_PREFIX "osgdb_")
…	…
87	87	IF(JPEG_FOUND)
88	88	ADD_SUBDIRECTORY(jpeg)
89		ENDIF(~~JPEG_FOUND~~)
	89	ENDIF()
90	90	IF(JASPER_FOUND)
91	91	ADD_SUBDIRECTORY(jp2)
92		ENDIF(~~JASPER_FOUND~~)
	92	ENDIF()
93	93	IF(OPENEXR_FOUND)
94	94	ADD_SUBDIRECTORY(exr)
95		ENDIF(~~OPENEXR_FOUND~~)
	95	ENDIF()
96	96	IF(GIFLIB_FOUND)
97	97	ADD_SUBDIRECTORY(gif)
98		ENDIF(~~GIFLIB_FOUND~~)
	98	ENDIF()
99	99	IF(PNG_FOUND)
100	100	ADD_SUBDIRECTORY(png)
101		ENDIF(~~PNG_FOUND~~)
	101	ENDIF()
102	102	IF(TIFF_FOUND)
103	103	ADD_SUBDIRECTORY(tiff)
104		ENDIF(~~TIFF_FOUND~~)
	104	ENDIF()
105	105	IF(GDAL_FOUND)
106	106	ADD_SUBDIRECTORY(gdal)
107	107	ADD_SUBDIRECTORY(ogr)
108		ENDIF(~~GDAL_FOUND~~)
	108	ENDIF()
109	109
110	110	IF(XUL_FOUND)
111		IF (WIN32 OR APPLE OR GTK_FOUND)
	111	IF(WIN32 OR APPLE OR GTK_FOUND)
112	112	ADD_SUBDIRECTORY(gecko)
113		ENDIF(~~WIN32 OR APPLE OR GTK_FOUND~~)
114		ENDIF(~~XUL_FOUND~~)
	113	ENDIF()
	114	ENDIF()
115	115
116	116
…	…
120	120	# 3D Image plugins
121	121	#
122		IF (DCMTK_FOUND AND ZLIB_FOUND)
123
	122	IF(DCMTK_FOUND AND ZLIB_FOUND)
124	123	ADD_SUBDIRECTORY(dicom)
125
126		ELSE (DCMTK_FOUND AND ZLIB_FOUND)
127
128		IF (ITK_FOUND)
	124	ELSE()
	125	IF(ITK_FOUND)
129	126	ADD_SUBDIRECTORY(dicom)
130		ENDIF(ITK_FOUND)
131
132		ENDIF(DCMTK_FOUND AND ZLIB_FOUND)
133
	127	ENDIF()
	128	ENDIF()
134	129
135	130	############################################################
…	…
142	137	IF(CURL_FOUND)
143	138	ADD_SUBDIRECTORY(curl)
144		ENDIF(~~CURL_FOUND~~)
	139	ENDIF()
145	140
146	141	IF(ZLIB_FOUND)
147	142	ADD_SUBDIRECTORY(gz)
148		ENDIF(ZLIB_FOUND)
149
	143	ENDIF()
150	144
151	145	IF(INVENTOR_FOUND)
152	146	ADD_SUBDIRECTORY(Inventor)
153		ENDIF(~~INVENTOR_FOUND~~)
	147	ENDIF()
154	148
155	149	IF(OPENVRML_FOUND)
156	150	ADD_SUBDIRECTORY(vrml)
157		ENDIF(~~OPENVRML_FOUND~~)
	151	ENDIF()
158	152
159	153	IF(COLLADA_FOUND)
160	154	ADD_SUBDIRECTORY(dae)
161		ENDIF(~~COLLADA_FOUND~~)
	155	ENDIF()
162	156
163	157	ADD_SUBDIRECTORY(lwo)
…	…
173	167	IF(PERFORMER_FOUND)
174	168	ADD_SUBDIRECTORY(pfb)
175		ENDIF(~~PERFORMER_FOUND~~)
	169	ENDIF()
176	170
177	171	ADD_SUBDIRECTORY(pic)
…	…
195	189	IF(XINE_FOUND)
196	190	ADD_SUBDIRECTORY(xine)
197		ENDIF(~~XINE_FOUND~~)
	191	ENDIF()
198	192
199	193	IF(FFMPEG_FOUND)
200	194	ADD_SUBDIRECTORY(ffmpeg)
201		ENDIF(~~FFMPEG_FOUND~~)
	195	ENDIF()
202	196
203	197	# IF(OPENAL_FOUND)
204	198	# ADD_SUBDIRECTORY(OpenAL)
205		# ENDIF(~~OPENAL_FOUND~~)
	199	# ENDIF()
206	200
207	201	IF(APPLE)
208	202	ADD_SUBDIRECTORY(imageio)
209		ENDIF(~~APPLE~~)
	203	ENDIF()
210	204
211	205	IF(QUICKTIME_FOUND)
212	206	ADD_SUBDIRECTORY(quicktime)
213		ENDIF(~~QUICKTIME_FOUND~~)
	207	ENDIF()
214	208
215	209	IF(FREETYPE_FOUND)
216	210	ADD_SUBDIRECTORY(freetype)
217		ENDIF(FREETYPE_FOUND)
	211	ENDIF()
	212
218	213	IF(ZLIB_FOUND)
219	214	ADD_SUBDIRECTORY(zip)
220		ENDIF(~~ZLIB_FOUND~~)
	215	ENDIF()
221	216
222	217	IF(RSVG_FOUND AND CAIRO_FOUND)
223	218	ADD_SUBDIRECTORY(svg)
224		ENDIF(~~RSVG_FOUND AND CAIRO_FOUND~~)
225
226		IF (POPPLER_FOUND AND CAIRO_FOUND)
	219	ENDIF()
	220
	221	IF(POPPLER_FOUND AND CAIRO_FOUND)
227	222	ADD_SUBDIRECTORY(pdf)
228		ENDIF(~~POPPLER_FOUND AND CAIRO_FOUND~~)
229
230		IF (LIBVNCSERVER_FOUND)
	223	ENDIF()
	224
	225	IF(LIBVNCSERVER_FOUND)
231	226	ADD_SUBDIRECTORY(vnc)
232		ENDIF(LIBVNCSERVER_FOUND)
233
	227	ENDIF()
234	228
235	229	##########to get all the variables of Cmake

OpenSceneGraph/trunk/src/osgShadow/CMakeLists.txt

r9671	r9949
1	1
2		IF (DYNAMIC_OPENSCENEGRAPH)
	2	IF(DYNAMIC_OPENSCENEGRAPH)
3	3	ADD_DEFINITIONS(-DOSGSHADOW_LIBRARY)
4		ELSE ~~(DYNAMIC_OPENSCENEGRAPH~~)
	4	ELSE()
5	5	ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
6		ENDIF(~~DYNAMIC_OPENSCENEGRAPH~~)
	6	ENDIF()
7	7
8	8	SET(LIB_NAME osgShadow)

OpenSceneGraph/trunk/src/osgSim/CMakeLists.txt

r9671	r9949
1	1
2		IF (DYNAMIC_OPENSCENEGRAPH)
	2	IF(DYNAMIC_OPENSCENEGRAPH)
3	3	ADD_DEFINITIONS(-DOSGSIM_LIBRARY)
4		ELSE ~~(DYNAMIC_OPENSCENEGRAPH~~)
	4	ELSE()
5	5	ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
6		ENDIF(~~DYNAMIC_OPENSCENEGRAPH~~)
	6	ENDIF()
7	7
8	8	SET(LIB_NAME osgSim)

OpenSceneGraph/trunk/src/osgTerrain/CMakeLists.txt

r9671	r9949
1		IF (DYNAMIC_OPENSCENEGRAPH)
	1	IF(DYNAMIC_OPENSCENEGRAPH)
2	2	ADD_DEFINITIONS(-DOSGTERRAIN_LIBRARY)
3		ELSE ~~(DYNAMIC_OPENSCENEGRAPH~~)
	3	ELSE()
4	4	ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
5		ENDIF(~~DYNAMIC_OPENSCENEGRAPH~~)
	5	ENDIF()
6	6
7	7	SET(LIB_NAME osgTerrain)

OpenSceneGraph/trunk/src/osgText/CMakeLists.txt

r9671	r9949
1	1
2		IF (DYNAMIC_OPENSCENEGRAPH)
	2	IF(DYNAMIC_OPENSCENEGRAPH)
3	3	ADD_DEFINITIONS(-DOSGTEXT_LIBRARY)
4		ELSE ~~(DYNAMIC_OPENSCENEGRAPH~~)
	4	ELSE()
5	5	ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
6		ENDIF(~~DYNAMIC_OPENSCENEGRAPH~~)
	6	ENDIF()
7	7
8	8	SET(LIB_NAME osgText)

OpenSceneGraph/trunk/src/osgUtil/CMakeLists.txt

r9940	r9949
1	1
2	2	# FIXME: For OS X, need flag for Framework or dylib
3		IF (DYNAMIC_OPENSCENEGRAPH)
	3	IF(DYNAMIC_OPENSCENEGRAPH)
4	4	ADD_DEFINITIONS(-DOSGUTIL_LIBRARY)
5		ELSE ~~(DYNAMIC_OPENSCENEGRAPH~~)
	5	ELSE()
6	6	ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
7		ENDIF(~~DYNAMIC_OPENSCENEGRAPH~~)
	7	ENDIF()
8	8
9	9	SET(LIB_NAME osgUtil)

OpenSceneGraph/trunk/src/osgViewer/CMakeLists.txt

r9879	r9949
1	1
2	2	# FIXME: For OS X, need flag for Framework or dylib
3		IF (DYNAMIC_OPENSCENEGRAPH)
	3	IF(DYNAMIC_OPENSCENEGRAPH)
4	4	ADD_DEFINITIONS(-DOSGVIEWER_LIBRARY)
5		ELSE ~~(DYNAMIC_OPENSCENEGRAPH~~)
	5	ELSE()
6	6	ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
7		ENDIF(~~DYNAMIC_OPENSCENEGRAPH~~)
	7	ENDIF()
8	8
9	9	SET(LIB_NAME osgViewer)
…	…
41	41
42	42	IF(WIN32)
43
44	43	#
45	44	# Enable workaround for OpenGL driver issues when used in multithreaded/multiscreen with NVidia drivers on Windows XP
…	…
52	51	IF(OSG_MULTIMONITOR_MULTITHREAD_WIN32_NVIDIA_WORKAROUND)
53	52	ADD_DEFINITIONS(-DOSG_MULTIMONITOR_MULTITHREAD_WIN32_NVIDIA_WORKAROUND)
54		ENDIF(~~OSG_MULTIMONITOR_MULTITHREAD_WIN32_NVIDIA_WORKAROUND~~)
	53	ENDIF()
55	54
56	55	SET(LIB_PUBLIC_HEADERS ${LIB_PUBLIC_HEADERS}
…	…
63	62	PixelBufferWin32.cpp
64	63	)
65
66		ELSE(WIN32)
67
	64	ELSE()
68	65	IF(APPLE)
69	66	SET(OSG_WINDOWING_SYSTEM "Carbon" CACHE STRING "Windowing system type for graphics window creation, options Carbon, Cocoa or X11.")
70		ELSE(~~APPLE~~)
	67	ELSE()
71	68	SET(OSG_WINDOWING_SYSTEM "X11" CACHE STRING "Windowing system type for graphics window creation. options only X11")
72		ENDIF(~~APPLE~~)
	69	ENDIF()
73	70
74	71	IF(${OSG_WINDOWING_SYSTEM} STREQUAL "Cocoa")
75		ADD_DEFINITIONS(-DUSE_DARWIN_COCOA_IMPLEMENTATION)
	72	ADD_DEFINITIONS(-DUSE_DARWIN_COCOA_IMPLEMENTATION)
76	73	SET(LIB_PUBLIC_HEADERS ${LIB_PUBLIC_HEADERS}
77	74	${HEADER_PATH}/api/Cocoa/GraphicsWindowCocoa
…	…
84	81	PixelBufferCocoa.mm
85	82	)
	83	SET(LIB_EXTRA_LIBS ${COCOA_LIBRARY} ${LIB_EXTRA_LIBS})
	84	ELSEIF(${OSG_WINDOWING_SYSTEM} STREQUAL "Carbon")
	85	ADD_DEFINITIONS(-DUSE_DARWIN_CARBON_IMPLEMENTATION)
	86	SET(LIB_PUBLIC_HEADERS ${LIB_PUBLIC_HEADERS}
	87	${HEADER_PATH}/api/Carbon/GraphicsWindowCarbon
	88	${HEADER_PATH}/api/Carbon/PixelBufferCarbon
	89	)
	90	SET(LIB_COMMON_FILES ${LIB_COMMON_FILES}
	91	GraphicsWindowCarbon.cpp
	92	DarwinUtils.h
	93	DarwinUtils.mm
	94	PixelBufferCarbon.cpp
	95	)
	96	SET(LIB_EXTRA_LIBS ${COCOA_LIBRARY} ${LIB_EXTRA_LIBS})
	97	ELSE()
	98	# X11 for everybody else
	99	INCLUDE(FindPkgConfig OPTIONAL)
	100	IF(PKG_CONFIG_FOUND)
	101	PKG_CHECK_MODULES(XRANDR xrandr)
	102	IF(XRANDR_FOUND)
	103	OPTION(OSGVIEWER_USE_XRANDR "Set to ON to enable Xrandr support for GraphicsWindowX11." ON)
	104	ELSE()
	105	SET(OSGVIEWER_USE_XRANDR OFF)
	106	ENDIF()
	107	ELSE()
	108	SET(OSGVIEWER_USE_XRANDR OFF)
	109	ENDIF()
86	110
87		SET(LIB_EXTRA_LIBS ${COCOA_LIBRARY} ${LIB_EXTRA_LIBS})
	111	SET(LIB_PUBLIC_HEADERS ${LIB_PUBLIC_HEADERS}
	112	${HEADER_PATH}/api/X11/GraphicsWindowX11
	113	${HEADER_PATH}/api/X11/PixelBufferX11
	114	)
88	115
89		ELSE(${OSG_WINDOWING_SYSTEM} STREQUAL "Cocoa")
90		IF(${OSG_WINDOWING_SYSTEM} STREQUAL "Carbon")
91		ADD_DEFINITIONS(-DUSE_DARWIN_CARBON_IMPLEMENTATION)
92		SET(LIB_PUBLIC_HEADERS ${LIB_PUBLIC_HEADERS}
93		${HEADER_PATH}/api/Carbon/GraphicsWindowCarbon
94		${HEADER_PATH}/api/Carbon/PixelBufferCarbon
95		)
96		SET(LIB_COMMON_FILES ${LIB_COMMON_FILES}
97		GraphicsWindowCarbon.cpp
98		DarwinUtils.h
99		DarwinUtils.mm
100		PixelBufferCarbon.cpp
101		)
102		SET(LIB_EXTRA_LIBS ${COCOA_LIBRARY} ${LIB_EXTRA_LIBS})
	116	SET(LIB_COMMON_FILES ${LIB_COMMON_FILES}
	117	GraphicsWindowX11.cpp
	118	PixelBufferX11.cpp
	119	)
	120
	121	IF(OSGVIEWER_USE_XRANDR)
	122	ADD_DEFINITIONS(-DOSGVIEWER_USE_XRANDR)
	123	SET(LIB_PRIVATE_HEADERS ${LIB_PRIVATE_HEADERS} ${XRANDR_INCLUDE_DIRS} )
103	124
104		ELSE(${OSG_WINDOWING_SYSTEM} STREQUAL "Carbon")
	125	IF(X11_Xrandr_LIB)
	126	SET(LIB_EXTRA_LIBS ${X11_Xrandr_LIB} ${LIB_EXTRA_LIBS})
	127	ELSE()
	128	SET(LIB_EXTRA_LIBS ${XRANDR_LIBRARIES} ${LIB_EXTRA_LIBS})
	129	ENDIF()
	130	ENDIF()
105	131
106		# X11 for everybody else
	132	# X11 on Apple requires X11 library plus OpenGL linking hack on Leopard
	133	IF(APPLE)
	134	# Find GL/glx.h
	135	IF(EXISTS ${CMAKE_OSX_SYSROOT}/usr/X11/include/GL/glx.h)
	136	SET(OPENGL_INCLUDE_DIR /usr/X11/include)
	137	SET(OPENGL_LIBRARIES /usr/X11/lib/libGL.dylib)
	138	ELSEIF(EXISTS ${CMAKE_OSX_SYSROOT}/usr/X11R6/include/GL/glx.h)
	139	SET(OPENGL_INCLUDE_DIR /usr/X11R6/include)
	140	SET(OPENGL_LIBRARIES /usr/X11R6/lib/libGL.dylib)
	141	ENDIF()
	142	INCLUDE_DIRECTORIES(BEFORE SYSTEM ${OPENGL_INCLUDE_DIR})
107	143
108
109		INCLUDE(FindPkgConfig OPTIONAL)
110		IF (PKG_CONFIG_FOUND)
111
112		PKG_CHECK_MODULES(XRANDR xrandr)
113
114		IF (XRANDR_FOUND)
115		OPTION(OSGVIEWER_USE_XRANDR "Set to ON to enable Xrandr support for GraphicsWindowX11." ON)
116		ELSE(XRANDR_FOUND)
117		SET(OSGVIEWER_USE_XRANDR OFF)
118		ENDIF (XRANDR_FOUND)
119		ELSE(PKG_CONFIG_FOUND)
120		SET(OSGVIEWER_USE_XRANDR OFF)
121		ENDIF(PKG_CONFIG_FOUND)
122
123
124		SET(LIB_PUBLIC_HEADERS ${LIB_PUBLIC_HEADERS}
125		${HEADER_PATH}/api/X11/GraphicsWindowX11
126		${HEADER_PATH}/api/X11/PixelBufferX11
127		)
128
129
130		SET(LIB_COMMON_FILES ${LIB_COMMON_FILES}
131		GraphicsWindowX11.cpp
132		PixelBufferX11.cpp
133		)
134
135		IF(OSGVIEWER_USE_XRANDR)
136
137		ADD_DEFINITIONS(-DOSGVIEWER_USE_XRANDR)
138		SET(LIB_PRIVATE_HEADERS ${LIB_PRIVATE_HEADERS} ${XRANDR_INCLUDE_DIRS} )
139
140		IF (X11_Xrandr_LIB)
141		SET(LIB_EXTRA_LIBS ${X11_Xrandr_LIB} ${LIB_EXTRA_LIBS})
142		ELSE(X11_Xrandr_LIB)
143		SET(LIB_EXTRA_LIBS ${XRANDR_LIBRARIES} ${LIB_EXTRA_LIBS})
144		ENDIF(X11_Xrandr_LIB)
145
146		ENDIF(OSGVIEWER_USE_XRANDR)
147
148		# X11 on Apple requires X11 library plus OpenGL linking hack on Leopard
149		IF(APPLE)
150		# Find GL/glx.h
151		IF(EXISTS ${CMAKE_OSX_SYSROOT}/usr/X11/include/GL/glx.h)
152		SET(OPENGL_INCLUDE_DIR /usr/X11/include)
153		SET(OPENGL_LIBRARIES /usr/X11/lib/libGL.dylib)
154		ELSEIF(EXISTS ${CMAKE_OSX_SYSROOT}/usr/X11R6/include/GL/glx.h)
155		SET(OPENGL_INCLUDE_DIR /usr/X11R6/include)
156		SET(OPENGL_LIBRARIES /usr/X11R6/lib/libGL.dylib)
157		ENDIF(EXISTS ${CMAKE_OSX_SYSROOT}/usr/X11/include/GL/glx.h)
158		INCLUDE_DIRECTORIES(BEFORE SYSTEM ${OPENGL_INCLUDE_DIR})
159
160		SET(LIB_EXTRA_LIBS ${X11_X11_LIB} ${OPENGL_LIBRARIES} ${LIB_EXTRA_LIBS})
161		SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:${CMAKE_OSX_SYSROOT}/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib")
162		ENDIF(APPLE)
163
164
165		ENDIF(${OSG_WINDOWING_SYSTEM} STREQUAL "Carbon")
166		ENDIF(${OSG_WINDOWING_SYSTEM} STREQUAL "Cocoa")
167		ENDIF(WIN32)
	144	SET(LIB_EXTRA_LIBS ${X11_X11_LIB} ${OPENGL_LIBRARIES} ${LIB_EXTRA_LIBS})
	145	SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:${CMAKE_OSX_SYSROOT}/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib")
	146	ENDIF(APPLE)
	147	ENDIF()
	148	ENDIF()
168	149
169	150
…	…
190	171	IF(MINGW OR CYGWIN)
191	172	LINK_EXTERNAL(${LIB_NAME} gdi32 )
192		ENDIF(~~MINGW OR CYGWIN~~)
	173	ENDIF()
193	174
194	175	INCLUDE(ModuleInstall OPTIONAL)
195	176
196		FOREACH( INCLUDEFILE ${LIB_PUBLIC_HEADERS} )
	177	FOREACH(INCLUDEFILE ${LIB_PUBLIC_HEADERS} )
197	178	FILE(RELATIVE_PATH REL_INCLUDEFILE ${HEADER_PATH} ${INCLUDEFILE})
198	179	GET_FILENAME_COMPONENT(REL_INCLUDE_PATH ${REL_INCLUDEFILE} PATH)
…	…
202	183	COMPONENT libopenscenegraph-dev
203	184	)
204		ENDFOREACH( ~~INCLUDEFILE~~)
	185	ENDFOREACH()

OpenSceneGraph/trunk/src/osgVolume/CMakeLists.txt

r9671	r9949
1	1
2		IF (DYNAMIC_OPENSCENEGRAPH)
	2	IF(DYNAMIC_OPENSCENEGRAPH)
3	3	ADD_DEFINITIONS(-DOSGVOLUME_LIBRARY)
4		ELSE ~~(DYNAMIC_OPENSCENEGRAPH~~)
	4	ELSE()
5	5	ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
6		ENDIF(~~DYNAMIC_OPENSCENEGRAPH~~)
	6	ENDIF()
7	7
8	8	SET(LIB_NAME osgVolume)

OpenSceneGraph/trunk/src/osgWidget/CMakeLists.txt

r9671	r9949
1		IF (DYNAMIC_OPENSCENEGRAPH)
	1	IF(DYNAMIC_OPENSCENEGRAPH)
2	2	ADD_DEFINITIONS(-DOSGWIDGET_LIBRARY)
3		ELSE ~~(DYNAMIC_OPENSCENEGRAPH~~)
	3	ELSE()
4	4	ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
5		ENDIF(~~DYNAMIC_OPENSCENEGRAPH~~)
	5	ENDIF()
6	6
7	7	SET(LIB_NAME osgWidget)

OpenSceneGraph/trunk/src/osgWrappers/CMakeLists.txt

r9878	r9949
1	1	PROJECT(OSG_WRAPPERS)
2	2
3		IF (NOT DYNAMIC_OPENSCENEGRAPH)
	3	IF(NOT DYNAMIC_OPENSCENEGRAPH)
4	4	ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
5		ENDIF(~~NOT DYNAMIC_OPENSCENEGRAPH~~)
	5	ENDIF()
6	6
7	7	SET(LIBRARY_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH}/${OSG_PLUGINS}")
…	…
10	10
11	11	IF(MSVC80)
12		IF(NOT OSG_MSVC_GENERATE_PLUGINS_AND_WRAPPERS_MANIFESTS)
13		SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /MANIFEST:NO")
14		~~ENDIF(NOT OSG_MSVC_GENERATE_PLUGINS_AND_WRAPPERS_MANIFESTS~~)
15		ENDIF(~~MSVC80~~)
	12	IF(NOT OSG_MSVC_GENERATE_PLUGINS_AND_WRAPPERS_MANIFESTS)
	13	SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /MANIFEST:NO")
	14	ENDIF()
	15	ENDIF()
16	16
17	17	MACRO(ADD_WRAPPER_LIB SUBDIR EXPORTDEF)
…	…
42	42	SET(LISTNAME ${ARG})
43	43	REMOVE(CURRLIST ${CURRLIST} )
44
45		ELSE(${EXPRESSION})
	44	ELSE()
46	45	SET(CURRLIST ${CURRLIST} ${ARG})
47
48		ENDIF(${EXPRESSION})
49		ENDFOREACH(ARG)
	46	ENDIF()
	47	ENDFOREACH()
50	48	SET(${LISTNAME} ${CURRLIST})
51	49	#MESSAGE(STATUS "STORED LIST [${LISTNAME}] = (${CURRLIST})")
…	…
55	53	FOREACH(EXF ${EXCLUDE})
56	54	REMOVE(SRC_FILES ${OPENSCENEGRAPH_DIR}/src/${SUBDIR}/${EXF})
57		ENDFOREACH(~~EXF~~)
	55	ENDFOREACH()
58	56
59	57	FOREACH(DEF ${DEFINE})
60	58	SET(DEFSTR "${DEFSTR} /D \"${DEF}\"")
61	59	#MESSAGE(STATUS "add symbol : " ${DEF})
62		ENDFOREACH(~~DEF~~)
	60	ENDFOREACH()
63	61
64	62	IF(NOT DEFSTR STREQUAL "")
65	63	SET_SOURCE_FILES_PROPERTIES(${SRC_FILES} PROPERTIES COMPILE_FLAGS ${DEFSTR})
66	64	#MESSAGE(STATUS "******* ADD COMPILE FLAGS ${DEFSTR} ********")
67		ENDIF(~~NOT DEFSTR STREQUAL ""~~)
	65	ENDIF()
68	66
69	67	#ADD_LIBRARY(${TARGET_NAME} SHARED ${SRC_FILES} )
70		ADD_LIBRARY(${TARGET_NAME} MODULE ${SRC_FILES} )
	68	ADD_LIBRARY(${TARGET_NAME} MODULE ${SRC_FILES} )
71	69
72	70	#not sure if needed, but for plugins only msvc need the d suffix
73	71	IF(NOT MSVC)
74	72	SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES DEBUG_POSTFIX "")
75		~~ELSE(NOT MSVC~~)
	73	ELSE()
76	74	IF(OSG_MSVC_VERSIONED_DLL)
77
78		#this is a hack... the build place is set to lib/<debug or release> by LIBARARY_OUTPUT_PATH equal to OUTPUT_LIBDIR
79		#the .lib will be crated in ../ so going straight in lib by the IMPORT_PREFIX property
80		#because we want dll placed in OUTPUT_BINDIR ie the bin folder sibling of lib, we can use ../../bin to go there,
81		#it is hardcoded, we should compute OUTPUT_BINDIR position relative to OUTPUT_LIBDIR ... to be implemented
82		#changing bin to something else breaks this hack
83		#the dll are placed in bin/${OSG_PLUGINS}
84
85		IF(NOT MSVC_IDE)
86		SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES PREFIX "../bin/${OSG_PLUGINS}/")
87		ELSE(NOT MSVC_IDE)
88		SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES PREFIX "../../bin/${OSG_PLUGINS}/" IMPORT_PREFIX "../")
89		ENDIF(NOT MSVC_IDE)
90
91
92		ELSE(OSG_MSVC_VERSIONED_DLL)
	75	#this is a hack... the build place is set to lib/<debug or release> by LIBARARY_OUTPUT_PATH equal to OUTPUT_LIBDIR
	76	#the .lib will be crated in ../ so going straight in lib by the IMPORT_PREFIX property
	77	#because we want dll placed in OUTPUT_BINDIR ie the bin folder sibling of lib, we can use ../../bin to go there,
	78	#it is hardcoded, we should compute OUTPUT_BINDIR position relative to OUTPUT_LIBDIR ... to be implemented
	79	#changing bin to something else breaks this hack
	80	#the dll are placed in bin/${OSG_PLUGINS}
93	81
	82	IF(NOT MSVC_IDE)
	83	SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES PREFIX "../bin/${OSG_PLUGINS}/")
	84	ELSE()
	85	SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES PREFIX "../../bin/${OSG_PLUGINS}/" IMPORT_PREFIX "../")
	86	ENDIF()
	87
	88	ELSE()
94	89	#in standard mode (unversioned) the .lib and .dll are placed in lib/<debug or release>/${OSG_PLUGINS}.
95	90	#here the PREFIX property has been used, the same result would be accomplidhe by prepending ${OSG_PLUGINS}/ to OUTPUT_NAME target property
96
97	91	SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES PREFIX "${OSG_PLUGINS}/")
98		ENDIF(~~OSG_MSVC_VERSIONED_DLL~~)
99		ENDIF(~~NOT MSVC~~)
	92	ENDIF()
	93	ENDIF()
100	94
101	95	SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES DEFINE_SYMBOL "${EXPORTDEF}" PROJECT_LABEL "Wrapper ${SUBDIR}")
…	…
105	99	LINK_EXTERNAL(${TARGET_NAME} ${OPENGL_LIBRARIES})
106	100
107		ELSE(~~MSVC AND OSG_MSVC_VERSIONED_DLL~~)
	101	ELSE()
108	102	TARGET_LINK_LIBRARIES(${TARGET_NAME} ${LINK})
109		ENDIF(~~MSVC AND OSG_MSVC_VERSIONED_DLL~~)
	103	ENDIF()
110	104	#MESSAGE(STATUS "--TARGET_LINK_LIBRARIES-->${TARGET_NAME}<->${LINK}<-")
111	105
	106	#FIXME: Deprecated
112	107	REMOVE(DEFINE ${DEFINE})
113	108	REMOVE(LINK ${LINK})
…	…
115	110
116	111	IF(WIN32)
117		INSTALL(TARGETS ${TARGET_NAME} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib/${OSG_PLUGINS} LIBRARY DESTINATION bin/${OSG_PLUGINS} COMPONENT libopenscenegraph-wrappers)
118		ELSE(WIN32)
119		INSTALL(TARGETS ${TARGET_NAME} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib${LIB_POSTFIX}/${OSG_PLUGINS} LIBRARY DESTINATION lib${LIB_POSTFIX}/${OSG_PLUGINS} COMPONENT libopenscenegraph-wrappers)
120		ENDIF(WIN32)
121
	112	INSTALL(TARGETS ${TARGET_NAME}
	113	RUNTIME DESTINATION bin
	114	ARCHIVE DESTINATION lib/${OSG_PLUGINS}
	115	LIBRARY DESTINATION bin/${OSG_PLUGINS}
	116	COMPONENT libopenscenegraph-wrappers)
	117	ELSE()
	118	INSTALL(TARGETS ${TARGET_NAME}
	119	RUNTIME DESTINATION bin
	120	ARCHIVE DESTINATION lib${LIB_POSTFIX}/${OSG_PLUGINS}
	121	LIBRARY DESTINATION lib${LIB_POSTFIX}/${OSG_PLUGINS}
	122	COMPONENT libopenscenegraph-wrappers)
	123	ENDIF()
122	124	ENDMACRO(ADD_WRAPPER_LIB)
123
124
125	125
126	126	SET(OSGWRAPPER_LIB_LIST
…	…
145	145
146	146	SET(OSGWRAPPER_DIR ${CMAKE_CURRENT_SOURCE_DIR})
	147
147	148	IF(MSVC)
148	149	SET(LIBRARY_OUTPUT_PATH ${OUTPUT_LIBDIR})
149		ENDIF(MSVC)
150		FOREACH(LIB ${OSGWRAPPER_LIB_LIST} )
151		ADD_WRAPPER_LIB(${LIB} OSGWRAPPERS_LIBRARY LINK OpenThreads osg osgGA ${LIB} osgIntrospection)
152		ENDFOREACH(LIB ${OSGWRAPPER_LIB_LIST} )
	150	ENDIF()
	151
	152	FOREACH(LIB ${OSGWRAPPER_LIB_LIST})
	153	ADD_WRAPPER_LIB(${LIB} OSGWRAPPERS_LIBRARY LINK OpenThreads osg osgGA ${LIB} osgIntrospection)
	154	ENDFOREACH()

Context Navigation

Changeset 9949

Legend:

Download in other formats: