From Luigi Calori, introduction of versioning of dll's and placement of dll and plugins into bin directory during build.
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
|
||||
SUBDIRS(
|
||||
OpenThreads
|
||||
#the old construct SUBDIRS( was substituded by ADD_SUBDIRECTORY that is to be preferred according on CMake docs.
|
||||
FOREACH( mylibfolder
|
||||
OpenThreads
|
||||
osg
|
||||
osgDB
|
||||
osgUtil
|
||||
@@ -14,7 +14,8 @@ SUBDIRS(
|
||||
osgTerrain
|
||||
osgViewer
|
||||
)
|
||||
|
||||
ADD_SUBDIRECTORY(${mylibfolder})
|
||||
ENDFOREACH( mylibfolder )
|
||||
OPTION(BUILD_OSG_PLUGINS "Enable to build OSG Plugins" ON)
|
||||
IF (BUILD_OSG_PLUGINS)
|
||||
ADD_SUBDIRECTORY(osgPlugins)
|
||||
|
||||
@@ -7,7 +7,9 @@
|
||||
PROJECT(OSG_PLUGINS_MASTER)
|
||||
|
||||
|
||||
SET(LIBRARY_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH}/${OSG_PLUGINS}")
|
||||
IF(NOT MSVC)
|
||||
SET(LIBRARY_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH}/${OSG_PLUGINS}")
|
||||
ENDIF(NOT MSVC)
|
||||
|
||||
IF(NOT MINGW)
|
||||
SET(CMAKE_SHARED_MODULE_PREFIX "")
|
||||
|
||||
@@ -62,7 +62,7 @@ SET(TARGET_H
|
||||
|
||||
INCLUDE_DIRECTORIES(.)
|
||||
|
||||
SET(TARGET_ADDED_LIBRARIES osgSim )
|
||||
SET(TARGET_ADDED_LIBRARIES osgSim osgText)
|
||||
|
||||
#### end var setup ###
|
||||
SETUP_PLUGIN(txp)
|
||||
|
||||
@@ -66,6 +66,7 @@ ADD_LIBRARY(${LIB_NAME}
|
||||
LINK_INTERNAL(${LIB_NAME}
|
||||
osgText
|
||||
osgUtil
|
||||
osgDB
|
||||
osg
|
||||
OpenThreads
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user