Changeset 2634

Timestamp:

Feb 2, 2009, 5:54:53 PM (16 years ago)

Author:

rgrieder

Message:

Fixed INSTALL target for Windows. The problem was that RUNTIME DESTINATION was missing for the libraries because a dll is considered a runtime target.

Location:

code/branches/buildsystem2

Files:

• cmake/InstallUtilities.cmake (added)
• src/CMakeLists.txt (modified) (1 diff)
• src/audio/CMakeLists.txt (modified) (1 diff)
• src/ceguilua/CMakeLists.txt (modified) (1 diff)
• src/core/CMakeLists.txt (modified) (1 diff)
• src/cpptcl/CMakeLists.txt (modified) (1 diff)
• src/network/CMakeLists.txt (modified) (1 diff)
• src/ogreceguirenderer/CMakeLists.txt (modified) (1 diff)
• src/ois/CMakeLists.txt (modified) (1 diff)
• src/orxonox/CMakeLists.txt (modified) (1 diff)
• src/tinyxml/CMakeLists.txt (modified) (1 diff)
• src/tolua/CMakeLists.txt (modified) (1 diff)
• src/util/CMakeLists.txt (modified) (1 diff)

code/branches/buildsystem2/src/CMakeLists.txt

@@ -22 +22 @@
 # various macro includes
 INCLUDE(FlagUtilities)
+INCLUDE(GenerateToluaBindings)
+INCLUDE(InstallUtilities)
 INCLUDE(SourceFileUtilities)
-INCLUDE(GenerateToluaBindings)
 
 # Use TinyXML++

code/branches/buildsystem2/src/audio/CMakeLists.txt

@@ -49 +49 @@
 )
 
-IF (NOT WIN32)
-  INSTALL(TARGETS audio LIBRARY DESTINATION lib)
-ENDIF (NOT WIN32)
+ORXONOX_INSTALL(audio)

code/branches/buildsystem2/src/ceguilua/CMakeLists.txt

@@ -76 +76 @@
 )
 
-IF(NOT WIN32)
-  INSTALL(TARGETS ceguilua_orxonox LIBRARY DESTINATION lib)
-ENDIF()
+ORXONOX_INSTALL(ceguilua_orxonox)

code/branches/buildsystem2/src/core/CMakeLists.txt

@@ -85 +85 @@
 )
 
-IF(NOT WIN32)
-  INSTALL(TARGETS core LIBRARY DESTINATION lib)
-ENDIF()
+ORXONOX_INSTALL(core)

code/branches/buildsystem2/src/cpptcl/CMakeLists.txt

@@ -43 +43 @@
 )
 
-IF(NOT WIN32)
-  INSTALL(TARGETS cpptcl_orxonox LIBRARY DESTINATION lib)
-ENDIF()
+ORXONOX_INSTALL(cpptcl_orxonox)

code/branches/buildsystem2/src/network/CMakeLists.txt

@@ -49 +49 @@
 )
 
-IF(NOT WIN32)
-  INSTALL(TARGETS network LIBRARY DESTINATION lib)
-ENDIF()
+ORXONOX_INSTALL(network)
 
 # build those parts only on request.

code/branches/buildsystem2/src/ogreceguirenderer/CMakeLists.txt

@@ -35 +35 @@
   ${CEGUI_LIBRARY}
 )
-IF(NOT WIN32)
-  INSTALL(TARGETS ogreceguirenderer_orxonox LIBRARY DESTINATION lib)
-ENDIF()
+
+ORXONOX_INSTALL(ogreceguirenderer_orxonox)

code/branches/buildsystem2/src/ois/CMakeLists.txt

@@ -62 +62 @@
 ENDIF()
 
+ORXONOX_INSTALL(ois_orxonox)

code/branches/buildsystem2/src/orxonox/CMakeLists.txt

@@ -84 +84 @@
 ENDIF(MSVC)
 
-IF(NOT WIN32)
-  INSTALL(TARGETS orxonox RUNTIME DESTINATION bin)
-ENDIF()
+ORXONOX_INSTALL(orxonox)

code/branches/buildsystem2/src/tinyxml/CMakeLists.txt

@@ -38 +38 @@
 ENDIF()
 
-IF(NOT WIN32)
-  INSTALL(TARGETS tinyxml++_orxonox LIBRARY DESTINATION lib)
-ENDIF()
+ORXONOX_INSTALL(tinyxml++_orxonox)

code/branches/buildsystem2/src/tolua/CMakeLists.txt

@@ -38 +38 @@
 TARGET_LINK_LIBRARIES(tolua++_orxonox ${LUA_LIBRARIES})
 
-IF(NOT WIN32)
-#  INSTALL(TARGETS tolualib_orxonox LIBRARY DESTINATION lib)
-ENDIF()
+ORXONOX_INSTALL(tolua++_orxonox)
 
 

code/branches/buildsystem2/src/util/CMakeLists.txt

@@ -62 +62 @@
 TARGET_LINK_LIBRARIES(util ${OGRE_LIBRARY})
 
-IF(NOT WIN32)
-  INSTALL(TARGETS util LIBRARY DESTINATION lib)
-ENDIF()
+ORXONOX_INSTALL(util)