From Rene Molenaar, "Using commandline build system nmake on windows does not work.

This is caused by the OSG_MSVC_VERSIONED_DLL hack. there are hard-coded paths to place the dll's in the bin /dir that normally would go in the lib/config (release/debug) dirs. Nmake has different locations for the files (no config dir). fix: change the macro's in OsgMacroUtils.cmake for the IF(NOT MSVC_IDE) situation. Libs go in lib/, and DLLs and executables go in bin/ To accopmplish this for MSVC_IDE the targets get a "../../bin" prefix, for nmake this should be "../bin" (because there are no config folders). This fix mimics the behaviour of the MSCV_IDE (visual studio) build system when building with nmake. Note: A change in the main CMakeLists.txt creates the needed plugin directory in the binary dir. see included files for the changes: r7885fix-v2/CMakeModules/OsgMacroUtils.cmake r7885fix-v2/osgWrappers/CMakeLists.txt r7885fix-v2/CMakeLists.txt The behaviour of visual studio projects (and other build systems) remain unchanged. Tested building and installing with nmake and visual studio 8 debug and release. "
2008-02-18 15:26:46 +00:00
parent 49ef41b373
commit e0e862e31a
3 changed files with 71 additions and 43 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -291,13 +291,17 @@ ENDIF(NOT DEFINED LIB_POSTFIX)
 #SET(OUTPUT_BINDIR ${PROJECT_BINARY_DIR}/bin/${CMAKE_SYSTEM_NAME})
 SET(OUTPUT_BINDIR ${PROJECT_BINARY_DIR}/bin)
 MAKE_DIRECTORY(${OUTPUT_BINDIR})
+IF(MSVC AND NOT MSVC_IDE)
+    MAKE_DIRECTORY(${OUTPUT_BINDIR}/${OSG_PLUGINS})
+ENDIF(MSVC AND NOT MSVC_IDE)
+
 SET(EXECUTABLE_OUTPUT_PATH ${OUTPUT_BINDIR})

 #SET(OUTPUT_LIBDIR ${PROJECT_BINARY_DIR}/lib/${CMAKE_SYSTEM_NAME})
 SET(OUTPUT_LIBDIR ${PROJECT_BINARY_DIR}/lib)
 MAKE_DIRECTORY(${OUTPUT_LIBDIR})
 IF(NOT MSVC)
-    MAKE_DIRECTORY(${OUTPUT_LIBDIR}/${OSG_PLUGINS})    
+    MAKE_DIRECTORY(${OUTPUT_LIBDIR}/${OSG_PLUGINS})
 ENDIF(NOT MSVC)
 SET(LIBRARY_OUTPUT_PATH ${OUTPUT_LIBDIR})

--- a/CMakeModules/OsgMacroUtils.cmake
+++ b/CMakeModules/OsgMacroUtils.cmake
@@ -22,17 +22,20 @@ ENDMACRO(LINK_WITH_VARIABLES TRGTNAME)

 MACRO(LINK_INTERNAL TRGTNAME)
    FOREACH(LINKLIB ${ARGN})
-    	IF(MSVC AND OSG_MSVC_VERSIONED_DLL)
-    		#when using versioned names, the .dll name differ from .lib name, there is a problem with that:
-    		#CMake 2.4.7, at least seem to use PREFIX instead of IMPORT_PREFIX  for computing linkage info to use into projects,
-    		# so we full path name to specify linkage, this prevent automatic inferencing of dependencies, so we add explicit depemdencies
-    		#to library targets used
-
-        TARGET_LINK_LIBRARIES(${TRGTNAME} optimized "${OUTPUT_LIBDIR}/${LINKLIB}" debug "${OUTPUT_LIBDIR}/${LINKLIB}${CMAKE_DEBUG_POSTFIX}")
-        ADD_DEPENDENCIES(${TRGTNAME} ${LINKLIB})
-      ELSE(MSVC AND OSG_MSVC_VERSIONED_DLL)
-        TARGET_LINK_LIBRARIES(${TRGTNAME} optimized "${LINKLIB}" debug "${LINKLIB}${CMAKE_DEBUG_POSTFIX}")
-    	ENDIF(MSVC AND OSG_MSVC_VERSIONED_DLL)
+        IF(MSVC AND OSG_MSVC_VERSIONED_DLL)
+            #when using versioned names, the .dll name differ from .lib name, there is a problem with that:
+            #CMake 2.4.7, at least seem to use PREFIX instead of IMPORT_PREFIX  for computing linkage info to use into projects,
+            # so we full path name to specify linkage, this prevent automatic inferencing of dependencies, so we add explicit depemdencies
+            #to library targets used
+        IF(NOT MSVC_IDE)
+            TARGET_LINK_LIBRARIES(${TRGTNAME} optimized "${OUTPUT_LIBDIR}/${LINKLIB}.lib" debug "${OUTPUT_LIBDIR}/${LINKLIB}${CMAKE_DEBUG_POSTFIX}.lib")
+        ELSE(NOT MSVC_IDE)
+            TARGET_LINK_LIBRARIES(${TRGTNAME} optimized "${OUTPUT_LIBDIR}/${LINKLIB}" debug "${OUTPUT_LIBDIR}/${LINKLIB}${CMAKE_DEBUG_POSTFIX}")
+        ENDIF(NOT MSVC_IDE)
+            ADD_DEPENDENCIES(${TRGTNAME} ${LINKLIB})
+        ELSE(MSVC AND OSG_MSVC_VERSIONED_DLL)
+            TARGET_LINK_LIBRARIES(${TRGTNAME} optimized "${LINKLIB}" debug "${LINKLIB}${CMAKE_DEBUG_POSTFIX}")
+        ENDIF(MSVC AND OSG_MSVC_VERSIONED_DLL)
    ENDFOREACH(LINKLIB)
 ENDMACRO(LINK_INTERNAL TRGTNAME)

@@ -95,7 +98,7 @@ MACRO(SETUP_LINK_LIBRARIES)
 #    FOREACH(LINKLIB ${TARGET_LIBRARIES})
 #            TARGET_LINK_LIBRARIES(${TARGET_TARGETNAME} optimized ${LINKLIB} debug "${LINKLIB}${CMAKE_DEBUG_POSTFIX}")
 #    ENDFOREACH(LINKLIB)
-		LINK_INTERNAL(${TARGET_TARGETNAME} ${TARGET_LIBRARIES})
+        LINK_INTERNAL(${TARGET_TARGETNAME} ${TARGET_LIBRARIES})
    FOREACH(LINKLIB ${TARGET_EXTERNAL_LIBRARIES})
            TARGET_LINK_LIBRARIES(${TARGET_TARGETNAME} ${LINKLIB})
    ENDFOREACH(LINKLIB)
@@ -103,8 +106,8 @@ MACRO(SETUP_LINK_LIBRARIES)
            LINK_WITH_VARIABLES(${TARGET_TARGETNAME} ${TARGET_LIBRARIES_VARS})
        ENDIF(TARGET_LIBRARIES_VARS)
    IF(MSVC  AND OSG_MSVC_VERSIONED_DLL)
-    	#when using full path name to specify linkage, it seems that already linked libs must be specified
-			LINK_EXTERNAL(${TARGET_TARGETNAME} ${OPENGL_LIBRARIES}) 
+        #when using full path name to specify linkage, it seems that already linked libs must be specified
+            LINK_EXTERNAL(${TARGET_TARGETNAME} ${OPENGL_LIBRARIES}) 
    ENDIF(MSVC AND OSG_MSVC_VERSIONED_DLL)

 ENDMACRO(SETUP_LINK_LIBRARIES)
@@ -140,24 +143,28 @@ MACRO(SETUP_PLUGIN PLUGIN_NAME)
    IF(NOT MSVC)
        SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES DEBUG_POSTFIX "")
    ELSE(NOT MSVC)
-    	IF(OSG_MSVC_VERSIONED_DLL) 
-    		   		
-				#this is a hack... the build place is set to lib/<debug or release> by LIBARARY_OUTPUT_PATH equal to OUTPUT_LIBDIR
-				#the .lib will be crated in ../ so going straight in lib by the IMPORT_PREFIX property
-				#because we want dll placed in OUTPUT_BINDIR ie the bin folder sibling of lib, we can use ../../bin to go there,
-				#it is hardcoded, we should compute OUTPUT_BINDIR position relative to OUTPUT_LIBDIR ... to be implemented
-				#changing bin to something else breaks this hack
-				#the dll are placed in bin/${OSG_PLUGINS} 
-				
-    		SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PREFIX "../../bin/${OSG_PLUGINS}/")
-	 			SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES IMPORT_PREFIX "../")
-    	ELSE(OSG_MSVC_VERSIONED_DLL)
-    		
-    		#in standard mode (unversioned) the .lib and .dll are placed in lib/<debug or release>/${OSG_PLUGINS}.
-    		#here the PREFIX property has been used, the same result would be accomplidhe by prepending ${OSG_PLUGINS}/ to OUTPUT_NAME target property
-    		
-    		SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PREFIX "${OSG_PLUGINS}/")
-    	ENDIF(OSG_MSVC_VERSIONED_DLL)
+        IF(OSG_MSVC_VERSIONED_DLL) 
+                       
+                #this is a hack... the build place is set to lib/<debug or release> by LIBARARY_OUTPUT_PATH equal to OUTPUT_LIBDIR
+                #the .lib will be crated in ../ so going straight in lib by the IMPORT_PREFIX property
+                #because we want dll placed in OUTPUT_BINDIR ie the bin folder sibling of lib, we can use ../../bin to go there,
+                #it is hardcoded, we should compute OUTPUT_BINDIR position relative to OUTPUT_LIBDIR ... to be implemented
+                #changing bin to something else breaks this hack
+                #the dll are placed in bin/${OSG_PLUGINS} 
+                
+                IF(NOT MSVC_IDE)
+                    SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PREFIX "../bin/${OSG_PLUGINS}/")                     
+                ELSE(NOT MSVC_IDE)
+                    SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PREFIX "../../bin/${OSG_PLUGINS}/" IMPORT_PREFIX "../")
+                ENDIF(NOT MSVC_IDE)
+
+        ELSE(OSG_MSVC_VERSIONED_DLL)
+            
+            #in standard mode (unversioned) the .lib and .dll are placed in lib/<debug or release>/${OSG_PLUGINS}.
+            #here the PREFIX property has been used, the same result would be accomplidhe by prepending ${OSG_PLUGINS}/ to OUTPUT_NAME target property
+            
+            SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PREFIX "${OSG_PLUGINS}/")
+        ENDIF(OSG_MSVC_VERSIONED_DLL)
    ENDIF(NOT MSVC)
    SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PROJECT_LABEL "${TARGET_LABEL}")
 
@@ -223,9 +230,9 @@ MACRO(SETUP_EXE IS_COMMANDLINE_APP)
    SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PROJECT_LABEL "${TARGET_LABEL}")
    SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}")
    SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES OUTPUT_NAME ${TARGET_NAME})
-    IF(MSVC AND OSG_MSVC_VERSIONED_DLL)
-    		SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PREFIX "../")    
-		ENDIF(MSVC AND OSG_MSVC_VERSIONED_DLL)
+    IF(MSVC_IDE AND OSG_MSVC_VERSIONED_DLL)
+            SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PREFIX "../")    
+    ENDIF(MSVC_IDE AND OSG_MSVC_VERSIONED_DLL)
    SETUP_LINK_LIBRARIES()    

 ENDMACRO(SETUP_EXE)
@@ -299,10 +306,22 @@ MACRO(HANDLE_MSVC_DLL)
        ELSE(${ARGC} GREATER 1)
                SET(LIB_SOVERSION ${OPENSCENEGRAPH_SOVERSION})
        ENDIF(${ARGC} GREATER 1)
-	
-        SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES PREFIX "../../bin/${LIB_PREFIX}${LIB_SOVERSION}-")
-        SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES IMPORT_PREFIX "../")
+    
+        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)
+            SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES PREFIX "../../bin/${LIB_PREFIX}${LIB_SOVERSION}-" IMPORT_PREFIX "../")
+        ENDIF(NOT MSVC_IDE)

-#	 SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES PREFIX "../../bin/osg${OPENSCENEGRAPH_SOVERSION}-")
-#	 SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES IMPORT_PREFIX "../")
+#     SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES PREFIX "../../bin/osg${OPENSCENEGRAPH_SOVERSION}-")
+#     SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES IMPORT_PREFIX "../")
 ENDMACRO(HANDLE_MSVC_DLL)
--- a/src/osgWrappers/CMakeLists.txt
+++ b/src/osgWrappers/CMakeLists.txt
@@ -78,8 +78,13 @@ MACRO(ADD_WRAPPER_LIB SUBDIR EXPORTDEF)
                #changing bin to something else breaks this hack
                #the dll are placed in bin/${OSG_PLUGINS} 
                
-            SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES PREFIX "../../bin/${OSG_PLUGINS}/")
-                 SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES IMPORT_PREFIX "../")
+                IF(NOT MSVC_IDE)
+                    SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES PREFIX "../bin/${OSG_PLUGINS}/")
+                ELSE(NOT MSVC_IDE)
+                    SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES PREFIX "../../bin/${OSG_PLUGINS}/" IMPORT_PREFIX "../")
+                ENDIF(NOT MSVC_IDE)
+                
+                
        ELSE(OSG_MSVC_VERSIONED_DLL)
            
            #in standard mode (unversioned) the .lib and .dll are placed in lib/<debug or release>/${OSG_PLUGINS}.