From 11abf29c14cf0537eed28d6b19b042525dd86e58 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 2 Dec 2009 14:58:47 +0000 Subject: [PATCH] From Farshid Lashkari, "I had to make a few small changes to some cmake files to enable the OSG_MSVC_GENERATE_PLUGINS_AND_WRAPPERS_MANIFESTS option for Visual Studio 2008." --- src/CMakeLists.txt | 2 +- src/osgPlugins/CMakeLists.txt | 2 +- src/osgWrappers/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7a51f85e5..344d8048c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -31,7 +31,7 @@ IF(BUILD_OSG_WRAPPERS) ADD_SUBDIRECTORY(osgWrappers) ENDIF() -IF(MSVC80) +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() diff --git a/src/osgPlugins/CMakeLists.txt b/src/osgPlugins/CMakeLists.txt index d412a7040..908aea3e0 100644 --- a/src/osgPlugins/CMakeLists.txt +++ b/src/osgPlugins/CMakeLists.txt @@ -17,7 +17,7 @@ ENDIF() SET(CMAKE_SHARED_MODULE_PREFIX ${OSG_PLUGIN_PREFIX}) -IF(MSVC80) +IF(MSVC80 OR MSVC90) IF(NOT OSG_MSVC_GENERATE_PLUGINS_AND_WRAPPERS_MANIFESTS) SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /MANIFEST:NO") ENDIF() diff --git a/src/osgWrappers/CMakeLists.txt b/src/osgWrappers/CMakeLists.txt index 5102b1071..763bdc0bf 100644 --- a/src/osgWrappers/CMakeLists.txt +++ b/src/osgWrappers/CMakeLists.txt @@ -8,7 +8,7 @@ SET(LIBRARY_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH}/${OSG_PLUGINS}") SET(CMAKE_SHARED_MODULE_PREFIX ${OSG_PLUGIN_PREFIX}) -IF(MSVC80) +IF(MSVC80 OR MSVC90) IF(NOT OSG_MSVC_GENERATE_PLUGINS_AND_WRAPPERS_MANIFESTS) SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /MANIFEST:NO") ENDIF()