48dad2d171
see http://www.openscenegraph.org/projects/osg/browser/OpenSceneGraph/trunk/src/CMakeLists.txt the option OSG_MSVC_GENERATE_PLUGINS_AND_WRAPPERS_MANIFESTS is set to ON only after the subdirectories are added, this causes /MANIFEST:NO while the option is ON after the first configure, generate. if this option is moved (i.e. above the ADD_SUBDIRECTORY statement) results are as expected. attached you will find the correct CMakeLists.txt "
45 lines
1.0 KiB
CMake
45 lines
1.0 KiB
CMake
IF(ANDROID)
|
|
SET(MODULE_USER_STATIC_OR_DYNAMIC ${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC})
|
|
ENDIF(ANDROID)
|
|
|
|
IF(MSVC80 OR MSVC90)
|
|
OPTION(OSG_MSVC_GENERATE_PLUGINS_AND_WRAPPERS_MANIFESTS "Generate or not manifests files under VS8 for dynamically loaded dlls" ON)
|
|
ENDIF()
|
|
|
|
#the old construct SUBDIRS( was substituded by ADD_SUBDIRECTORY that is to be preferred according on CMake docs.
|
|
FOREACH( mylibfolder
|
|
OpenThreads
|
|
osg
|
|
osgDB
|
|
osgUtil
|
|
osgGA
|
|
osgText
|
|
osgViewer
|
|
osgAnimation
|
|
osgFX
|
|
osgManipulator
|
|
osgParticle
|
|
osgPresentation
|
|
osgShadow
|
|
osgSim
|
|
osgTerrain
|
|
osgWidget
|
|
osgVolume
|
|
osgWrappers/serializers
|
|
osgWrappers/deprecated-dotosg
|
|
osgPlugins
|
|
)
|
|
|
|
ADD_SUBDIRECTORY(${mylibfolder})
|
|
|
|
ENDFOREACH()
|
|
|
|
IF (QT4_FOUND AND NOT ANDROID)
|
|
ADD_SUBDIRECTORY(osgQt)
|
|
ENDIF()
|
|
|
|
IF(ANDROID)
|
|
configure_file("${OSG_ANDROID_TEMPLATES}/Android.mk.src.in" "${CMAKE_CURRENT_BINARY_DIR}/Android.mk")
|
|
ENDIF()
|
|
|