Changeset 7425

Timestamp:

09/14/07 13:06:12

Author:

robert

Message:

From Andy Skinner, added support for ot-soversion-OpenThreads?.dll dll naming under Windows

Files:

• OpenSceneGraph/trunk/CMakeModules/OsgMacroUtils.cmake (modified) (2 diffs)

OpenSceneGraph/trunk/CMakeModules/OsgMacroUtils.cmake

@@ -278 +278 @@
-ENDMACRO(SETUP_COMMANDLINE_EXAMPLE)
-
+# Takes two optional arguments -- osg prefix and osg version
-MACRO(HANDLE_MSVC_DLL)
-        #this is a hack... the build place is set to lib/<debug or release> by LIBARARY_OUTPUT_PATH equal to OUTPUT_LIBDIR
@@ -285 +286 @@
-        #changing bin to something else breaks this hack
-        #the dll are versioned by prefixing the name with osg${OPENSCENEGRAPH_SOVERSION}-
+
+        # LIB_PREFIX: use "osg" by default, else whatever we've been given.
+        IF(${ARGC} GREATER 0)
+                SET(LIB_PREFIX ${ARGV0})
+        ELSE(${ARGC} GREATER 0)
+                SET(LIB_PREFIX osg)
+        ENDIF(${ARGC} GREATER 0)
+
+        # LIB_SOVERSION: use OSG's soversion by default, else whatever we've been given
+        IF(${ARGC} GREATER 1)
+                SET(LIB_SOVERSION ${ARGV1})
+        ELSE(${ARGC} GREATER 1)
+                SET(LIB_SOVERSION ${OPENSCENEGRAPH_SOVERSION})
+        ENDIF(${ARGC} GREATER 1)
-        
-
-
+
+
+
+
+
-ENDMACRO(HANDLE_MSVC_DLL)