From f4be375ab8757b4cd2eaf246f8b864de346aa4e0 Mon Sep 17 00:00:00 2001 From: Paul MARTZ Date: Mon, 28 Mar 2011 02:38:46 +0000 Subject: [PATCH] 2.8 branch: Merging r11354 from trunk to fix OpenThreads CMake INSTALL target issues in VS2010. --- CMakeModules/OsgMacroUtils.cmake | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/CMakeModules/OsgMacroUtils.cmake b/CMakeModules/OsgMacroUtils.cmake index 5e6281b9a..fd65d4033 100644 --- a/CMakeModules/OsgMacroUtils.cmake +++ b/CMakeModules/OsgMacroUtils.cmake @@ -156,7 +156,9 @@ MACRO(SETUP_PLUGIN PLUGIN_NAME) IF(NOT MSVC_IDE) SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PREFIX "${OSG_PLUGINS}/") ELSE(NOT MSVC_IDE) - SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PREFIX "../${OSG_PLUGINS}/") + IF(MSVC_VERSION LESS 1600) + SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PREFIX "../${OSG_PLUGINS}/") + ENDIF() ENDIF(NOT MSVC_IDE) ELSE(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4) IF(OSG_MSVC_VERSIONED_DLL) @@ -257,7 +259,9 @@ MACRO(SETUP_EXE IS_COMMANDLINE_APP) SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES OUTPUT_NAME ${TARGET_NAME}) IF(MSVC_IDE AND OSG_MSVC_VERSIONED_DLL) + IF(MSVC_VERSION LESS 1600) SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PREFIX "../") + ENDIF() ENDIF(MSVC_IDE AND OSG_MSVC_VERSIONED_DLL) SETUP_LINK_LIBRARIES() @@ -356,7 +360,9 @@ MACRO(HANDLE_MSVC_DLL) ) ENDIF (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4) ELSE(NOT MSVC_IDE) - SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES PREFIX "../../bin/${LIB_PREFIX}${LIB_SOVERSION}-" IMPORT_PREFIX "../") + IF(MSVC_VERSION LESS 1600) + SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES PREFIX "../../bin/${LIB_PREFIX}${LIB_SOVERSION}-" IMPORT_PREFIX "../") + ENDIF() ENDIF(NOT MSVC_IDE) # SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES PREFIX "../../bin/osg${OPENSCENEGRAPH_SOVERSION}-")