From 54127cea20148a903b3fcf91b26458ce5c522e32 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Mon, 12 Mar 2007 12:46:36 +0000
Subject: [PATCH] Fixed install paths of wrappers and plugins

---
 CMakeModules/OsgMacroUtils.cmake | 4 ++--
 src/osgWrappers/CMakeLists.txt   | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CMakeModules/OsgMacroUtils.cmake b/CMakeModules/OsgMacroUtils.cmake
index 7077c494b..bc4686a15 100644
--- a/CMakeModules/OsgMacroUtils.cmake
+++ b/CMakeModules/OsgMacroUtils.cmake
@@ -238,7 +238,7 @@ MACRO(ADD_OSG_PLUGIN SUBDIR)
 			ENDIF(${LINKLIB} MATCHES "osg")	
 		ENDFOREACH(LINKLIB)
 	#ELSE(UNIX)
-	#	SET_TARGET_PROPERTIES(${TARGET} PROPERTIES PROJECT_LABEL "osgPlugin ${SUBDIR}")
+	#	SET_TARGET_PROPERTIES(${TARGET} PROPERTIES PROJECT_LABEL "osgPlugins ${SUBDIR}")
 	#	TARGET_LINK_LIBRARIES(${TARGET} osg osgDB osgUtil ${ARGV1} ${ARGV2} ${ARGV3} ${ARGV4} ${ARGV5})
 	#ENDIF(UNIX)
 	#speed#TARGET_LOCATIONS_ACCUM(${TARGET})
@@ -247,7 +247,7 @@ MACRO(ADD_OSG_PLUGIN SUBDIR)
 	IF(WIN32)
 		INSTALL(TARGETS ${TARGET} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION bin )
 	ELSE(WIN32)
-		INSTALL(TARGETS ${TARGET} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib${LIB_POSTFIX}/osgPlugin LIBRARY DESTINATION lib${LIB_POSTFIX}/osgPlugin )
+		INSTALL(TARGETS ${TARGET} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib${LIB_POSTFIX}/osgPlugins LIBRARY DESTINATION lib${LIB_POSTFIX}/osgPlugins )
 	ENDIF(WIN32)
 ENDMACRO(ADD_OSG_PLUGIN)
 
diff --git a/src/osgWrappers/CMakeLists.txt b/src/osgWrappers/CMakeLists.txt
index f381fe106..2e17f365e 100644
--- a/src/osgWrappers/CMakeLists.txt
+++ b/src/osgWrappers/CMakeLists.txt
@@ -31,7 +31,7 @@ MACRO(ADD_WRAPPER_LIB SUBDIR EXPORTDEF)
 		SET(EXPRESSION ${IS_LINK} OR ${IS_DEFINE} OR ${IS_EXCLUDE})
 		IF(${EXPRESSION})
 			SET(${LISTNAME} ${CURRLIST})
-			MESSAGE(STATUS "STORED LIST [${LISTNAME}] = (${CURRLIST})")
+			# MESSAGE(STATUS "STORED LIST [${LISTNAME}] = (${CURRLIST})")
 			SET(LISTNAME ${ARG})
 			REMOVE(CURRLIST ${CURRLIST} )
 			
@@ -70,7 +70,11 @@ MACRO(ADD_WRAPPER_LIB SUBDIR EXPORTDEF)
 	REMOVE(LINK ${LINK})	
 	REMOVE(EXCLUDE ${EXCLUDE})	
 	
-	INSTALL_TARGETS(/lib ${TARGET_NAME} )
+	IF(WIN32)
+		INSTALL(TARGETS ${TARGET_NAME} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION bin )
+	ELSE(WIN32)
+		INSTALL(TARGETS ${TARGET_NAME} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib${LIB_POSTFIX}/osgPlugins LIBRARY DESTINATION lib${LIB_POSTFIX}/osgPlugins )
+	ENDIF(WIN32)
 	
 ENDMACRO(ADD_WRAPPER_LIB)