From 42d893c426f91ea52b8df078a61c7345efea97ae Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Thu, 10 Mar 2011 14:44:49 +0000
Subject: [PATCH] From Mourad Boufarguine, "I gave projects folders in VS a
 try, it works for applications, plugins and examples but not for the osg core
 libraries. Attached OsgMacroUtils.cmake is a tiny fix for this. OpenThreads
 is addressed seperately."

---
 CMakeModules/OsgMacroUtils.cmake     | 5 +----
 src/OpenThreads/win32/CMakeLists.txt | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/CMakeModules/OsgMacroUtils.cmake b/CMakeModules/OsgMacroUtils.cmake
index fdd828c2b..fc948d328 100644
--- a/CMakeModules/OsgMacroUtils.cmake
+++ b/CMakeModules/OsgMacroUtils.cmake
@@ -216,15 +216,12 @@ MACRO(SETUP_LIBRARY LIB_NAME)
     ELSE()
         SET(TARGET_NAME ${LIB_NAME} )
         SET(TARGET_TARGETNAME ${LIB_NAME} )
-        SET_TARGET_PROPERTIES(${CORELIB_NAME} PROPERTIES FOLDER "OSG Core")
-
-
         ADD_LIBRARY(${LIB_NAME}
             ${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
             ${TARGET_H}
             ${TARGET_SRC}
         )
-    
+        SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES FOLDER "OSG Core")
         IF(TARGET_LABEL)
             SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PROJECT_LABEL "${TARGET_LABEL}")
         ENDIF(TARGET_LABEL)
diff --git a/src/OpenThreads/win32/CMakeLists.txt b/src/OpenThreads/win32/CMakeLists.txt
index 414e90aa7..21fc70af7 100644
--- a/src/OpenThreads/win32/CMakeLists.txt
+++ b/src/OpenThreads/win32/CMakeLists.txt
@@ -25,7 +25,7 @@ ADD_LIBRARY(${LIB_NAME}
     ${OPENTHREADS_VERSIONINFO_RC}
 )
 
-
+SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES FOLDER "OSG Core")
 IF(OPENTHREADS_SONAMES)
   SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES VERSION ${OPENTHREADS_VERSION} SOVERSION ${OPENTHREADS_SOVERSION})
 ENDIF()