Attachment #140206 for bug #91526




SET(OPENSCENEGRAPH_MAJOR_VERSION 2)
SET(OPENSCENEGRAPH_MINOR_VERSION 3)
SET(OPENSCENEGRAPH_PATCH_VERSION 1)
IF(NOT DEFINED OPENSCENEGRAPH_SOVERSION)
SET(OPENSCENEGRAPH_SOVERSION 27)
ENDIF(NOT DEFINED OPENSCENEGRAPH_SOVERSION)

IF(NOT DEFINED OPENSCENEGRAPH_VERSION)
SET(OPENSCENEGRAPH_VERSION ${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION}.${OPENSCENEGRAPH_PATCH_VERSION})
ENDIF(NOT DEFINED OPENSCENEGRAPH_VERSION)

IF(NOT DEFINED OSG_PLUGINS)
SET(OSG_PLUGINS osgPlugins-${OPENSCENEGRAPH_VERSION})
ENDIF(NOT DEFINED OSG_PLUGINS)

SET(OSG_PLUGIN_PREFIX "")


################################################################################
# Installation stuff

SET(CMAKE_DEBUG_POSTFIX  "")

IF(UNIX AND NOT WIN32 AND NOT APPLE)
  IF(CMAKE_SIZEOF_VOID_P MATCHES "8")

Lines 161-166 Link Here

(-)CMakeModules/OsgMacroUtils.cmake.org (+4 lines)
161	ENDIF(NOT MSVC)	161	ENDIF(NOT MSVC)
162	SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PROJECT_LABEL "${TARGET_LABEL}")	162	SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PROJECT_LABEL "${TARGET_LABEL}")
163		163
		164	IF(OPENSCENEGRAPH_SONAMES)
		165	SET_TARGET_PROPERTIES(${CORELIB_NAME} PROPERTIES VERSION ${OPENSCENEGRAPH_VERSION} SOVERSION ${OPENSCENEGRAPH_SOVERSION})
		166	ENDIF(OPENSCENEGRAPH_SONAMES)
		167
164	SETUP_LINK_LIBRARIES()	168	SETUP_LINK_LIBRARIES()
165		169
166	#the installation path are differentiated for win32 that install in bib versus other architecture that install in lib${LIB_POSTFIX}/${OSG_PLUGINS}	170	#the installation path are differentiated for win32 that install in bib versus other architecture that install in lib${LIB_POSTFIX}/${OSG_PLUGINS}

Return to bug 91526

Lines 17-27 Link Here

(-)CMakeLists.txt.org (-1 / +7 lines)
17	SET(OPENSCENEGRAPH_MAJOR_VERSION 2)	17	SET(OPENSCENEGRAPH_MAJOR_VERSION 2)
18	SET(OPENSCENEGRAPH_MINOR_VERSION 3)	18	SET(OPENSCENEGRAPH_MINOR_VERSION 3)
19	SET(OPENSCENEGRAPH_PATCH_VERSION 1)	19	SET(OPENSCENEGRAPH_PATCH_VERSION 1)
		20	IF(NOT DEFINED OPENSCENEGRAPH_SOVERSION)
20	SET(OPENSCENEGRAPH_SOVERSION 27)	21	SET(OPENSCENEGRAPH_SOVERSION 27)
		22	ENDIF(NOT DEFINED OPENSCENEGRAPH_SOVERSION)
21		23
		24	IF(NOT DEFINED OPENSCENEGRAPH_VERSION)
22	SET(OPENSCENEGRAPH_VERSION ${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION}.${OPENSCENEGRAPH_PATCH_VERSION})	25	SET(OPENSCENEGRAPH_VERSION ${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION}.${OPENSCENEGRAPH_PATCH_VERSION})
		26	ENDIF(NOT DEFINED OPENSCENEGRAPH_VERSION)
23		27
		28	IF(NOT DEFINED OSG_PLUGINS)
24	SET(OSG_PLUGINS osgPlugins-${OPENSCENEGRAPH_VERSION})	29	SET(OSG_PLUGINS osgPlugins-${OPENSCENEGRAPH_VERSION})
		30	ENDIF(NOT DEFINED OSG_PLUGINS)
25		31
26	SET(OSG_PLUGIN_PREFIX "")	32	SET(OSG_PLUGIN_PREFIX "")
27		33
Lines 276-282 Link Here
276	################################################################################	282	################################################################################
277	# Installation stuff	283	# Installation stuff
278		284
279	SET(CMAKE_DEBUG_POSTFIX "d")	285	SET(CMAKE_DEBUG_POSTFIX "")
280		286
281	IF(UNIX AND NOT WIN32 AND NOT APPLE)	287	IF(UNIX AND NOT WIN32 AND NOT APPLE)
282	IF(CMAKE_SIZEOF_VOID_P MATCHES "8")	288	IF(CMAKE_SIZEOF_VOID_P MATCHES "8")