From fb65fc5e0a06b5d62372f8210e499caca1ce38ac Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Sat, 8 Dec 2007 17:04:52 +0000 Subject: [PATCH] From Serge Lages, "Hi Robert, You were right about the CMAKE_MODULE_LINKER_FLAGS option for CMake, so here is a modification allowing to not generate the manifest files for the plugins making them a lot more easy to redistribute. I have also made the same modification to the wrappers as they are also put into the osgPlugin folder when generated. " --- src/osgPlugins/CMakeLists.txt | 3 +++ src/osgWrappers/CMakeLists.txt | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/osgPlugins/CMakeLists.txt b/src/osgPlugins/CMakeLists.txt index 5b8d3af36..8e813fbd4 100644 --- a/src/osgPlugins/CMakeLists.txt +++ b/src/osgPlugins/CMakeLists.txt @@ -13,6 +13,9 @@ ENDIF(NOT MSVC) SET(CMAKE_SHARED_MODULE_PREFIX ${OSG_PLUGIN_PREFIX}) +IF(MSVC80) + SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /MANIFEST:NO") +ENDIF(MSVC80) SET(TARGET_DEFAULT_PREFIX "osgdb_") SET(TARGET_DEFAULT_LABEL_PREFIX "Plugins") diff --git a/src/osgWrappers/CMakeLists.txt b/src/osgWrappers/CMakeLists.txt index a280f8040..e0ed2b787 100644 --- a/src/osgWrappers/CMakeLists.txt +++ b/src/osgWrappers/CMakeLists.txt @@ -4,6 +4,9 @@ SET(LIBRARY_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH}/${OSG_PLUGINS}") SET(CMAKE_SHARED_MODULE_PREFIX ${OSG_PLUGIN_PREFIX}) +IF(MSVC80) + SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /MANIFEST:NO") +ENDIF(MSVC80) MACRO(ADD_WRAPPER_LIB SUBDIR EXPORTDEF) SET(TARGET_NAME "osgwrapper_${SUBDIR}")