root/OpenSceneGraph/trunk/src/CMakeLists.txt @ 12397

Revision 12397, 1.0 kB (checked in by robert, 4 years ago)

From Rene Molenaar, "I have found a problem regarding manifest in the plugins,
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
"

  • Property svn:eol-style set to native
Line 
1IF(ANDROID)
2    SET(MODULE_USER_STATIC_OR_DYNAMIC ${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC})
3ENDIF(ANDROID)
4
5IF(MSVC80 OR MSVC90)
6  OPTION(OSG_MSVC_GENERATE_PLUGINS_AND_WRAPPERS_MANIFESTS "Generate or not manifests files under VS8 for dynamically loaded dlls" ON)
7ENDIF()
8
9#the old construct SUBDIRS( was substituded by ADD_SUBDIRECTORY that is to be preferred according on CMake docs.
10FOREACH( mylibfolder
11        OpenThreads
12        osg
13        osgDB
14        osgUtil
15        osgGA
16        osgText
17        osgViewer
18        osgAnimation
19        osgFX
20        osgManipulator
21        osgParticle
22        osgPresentation
23        osgShadow
24        osgSim
25        osgTerrain
26        osgWidget
27        osgVolume
28        osgWrappers/serializers
29        osgWrappers/deprecated-dotosg
30        osgPlugins
31    )
32
33    ADD_SUBDIRECTORY(${mylibfolder})
34
35ENDFOREACH()
36
37IF (QT4_FOUND AND NOT ANDROID)
38    ADD_SUBDIRECTORY(osgQt)
39ENDIF()
40
41IF(ANDROID)
42    configure_file("${OSG_ANDROID_TEMPLATES}/Android.mk.src.in" "${CMAKE_CURRENT_BINARY_DIR}/Android.mk")
43ENDIF()
44
Note: See TracBrowser for help on using the browser.