diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c063eb9ae..f45dc2007 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2,6 +2,10 @@ 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 @@ -34,10 +38,6 @@ IF (QT4_FOUND AND NOT ANDROID) ADD_SUBDIRECTORY(osgQt) ENDIF() -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() - IF(ANDROID) configure_file("${OSG_ANDROID_TEMPLATES}/Android.mk.src.in" "${CMAKE_CURRENT_BINARY_DIR}/Android.mk") ENDIF()