From 71814fe26634ec85ea86c63255f26622dbec42fa Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Mon, 27 Oct 2008 09:48:34 +0000
Subject: [PATCH] From Mathieu Marache, "I came across a bug when building
 OpenSceneGraph with MSVC_VERSIONED_DLL, NMake makefiles and CMake 2.6.2. The
 compilation fails because it tries to copy ot11-OpenThreads.lib to
 OpenThreads.lib which is valid for the 2.4.x era of CMake but not anymore in
 2.6.x era. The provided file from the CMakeModules directory adds a tests on
 the CMake version and corrects this. Works for me now."

---
 CMakeModules/OsgMacroUtils.cmake | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/CMakeModules/OsgMacroUtils.cmake b/CMakeModules/OsgMacroUtils.cmake
index 95bb564ea..c75bc49d6 100644
--- a/CMakeModules/OsgMacroUtils.cmake
+++ b/CMakeModules/OsgMacroUtils.cmake
@@ -337,18 +337,20 @@ MACRO(HANDLE_MSVC_DLL)
     
         IF(NOT MSVC_IDE) 
             SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES PREFIX "../bin/${LIB_PREFIX}${LIB_SOVERSION}-")
-            SET(NEW_LIB_NAME "${OUTPUT_BINDIR}/${LIB_PREFIX}${LIB_SOVERSION}-${LIB_NAME}")
-            ADD_CUSTOM_COMMAND(
-                TARGET ${LIB_NAME}
-                POST_BUILD
-                COMMAND ${CMAKE_COMMAND} -E copy "${NEW_LIB_NAME}.lib"  "${OUTPUT_LIBDIR}/${LIB_NAME}.lib"
-                COMMAND ${CMAKE_COMMAND} -E copy "${NEW_LIB_NAME}.exp"  "${OUTPUT_LIBDIR}/${LIB_NAME}.exp"
-                COMMAND ${CMAKE_COMMAND} -E remove "${NEW_LIB_NAME}.lib"
-                COMMAND ${CMAKE_COMMAND} -E remove "${NEW_LIB_NAME}.exp"
-                )
-        ELSE(NOT MSVC_IDE)
+            IF (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4) 
+                SET(NEW_LIB_NAME "${OUTPUT_BINDIR}/${LIB_PREFIX}${LIB_SOVERSION}-${LIB_NAME}")
+                ADD_CUSTOM_COMMAND(
+                    TARGET ${LIB_NAME}
+                    POST_BUILD
+                    COMMAND ${CMAKE_COMMAND} -E copy "${NEW_LIB_NAME}.lib"  "${OUTPUT_LIBDIR}/${LIB_NAME}.lib"
+                    COMMAND ${CMAKE_COMMAND} -E copy "${NEW_LIB_NAME}.exp"  "${OUTPUT_LIBDIR}/${LIB_NAME}.exp"
+                    COMMAND ${CMAKE_COMMAND} -E remove "${NEW_LIB_NAME}.lib"
+                    COMMAND ${CMAKE_COMMAND} -E remove "${NEW_LIB_NAME}.exp"
+                    )
+            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 "../")
-        ENDIF(NOT MSVC_IDE)
+        ENDIF(NOT MSVC_IDE) 
 
 #     SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES PREFIX "../../bin/osg${OPENSCENEGRAPH_SOVERSION}-")
 #     SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES IMPORT_PREFIX "../")