Changeset 2579 for code/branches/buildsystem2/src

Timestamp:

Jan 8, 2009, 9:37:41 PM (16 years ago)

Author:

rgrieder

Message:

• Equipped find scripts with debug/optimized functions. If you have different debug prefixes on your platform simply change ${LIBRARY_DEBUG_POSTFIX} ("_d" default).
• Clean up in ConfigMSVC.cmake and ConfigMinGW.cmake
• Also had a good look at the MinGW libraries according to the libs_1889_mingw.zip (no warranty at all, hope I got them all)
• INSTALL commands are currently limited to non Windows platforms (don't yet know why it doesn't work)

Location:

code/branches/buildsystem2/src

Files:

• audio/CMakeLists.txt (modified) (1 diff)
• ceguilua-0.5.0/ceguilua/CMakeLists.txt (modified) (1 diff)
• ceguilua-0.6.1/ceguilua/CMakeLists.txt (modified) (1 diff)
• core/CMakeLists.txt (modified) (1 diff)
• cpptcl/CMakeLists.txt (modified) (1 diff)
• network/CMakeLists.txt (modified) (2 diffs)
• ogreceguirenderer/CMakeLists.txt (modified) (1 diff)
• ois/CMakeLists.txt (modified) (2 diffs)
• orxonox/CMakeLists.txt (modified) (1 diff)
• tinyxml/CMakeLists.txt (modified) (1 diff)
• tolua/CMakeLists.txt (modified) (1 diff)
• util/CMakeLists.txt (modified) (1 diff)

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

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

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

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

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

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

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

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

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

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

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

@@ -31 +31 @@
 )
 
-INSTALL(TARGETS network LIBRARY DESTINATION lib)
+IF (NOT WIN32)
+  INSTALL(TARGETS network LIBRARY DESTINATION lib)
+ENDIF (NOT WIN32)
 
 # build those parts only on request.
@@ -43 +45 @@
     ${OGRE_LIBRARY}
     network
-    ${ENet_LIBRARIES}
+    ${ENet_LIBRARY}
     ${ZLIB_LIBRARY}
   )

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

@@ -6 +6 @@
 
 ADD_LIBRARY(ogreceguirenderer_orxonox SHARED ${SRC_FILES})
-INSTALL(TARGETS ogreceguirenderer_orxonox LIBRARY DESTINATION lib)
+
+IF (NOT WIN32)
+  INSTALL(TARGETS ogreceguirenderer_orxonox LIBRARY DESTINATION lib)
+ENDIF (NOT WIN32)

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

@@ +1 @@
+INCLUDE_DIRECTORIES(.)
+
 SET( OIS_SRC_FILES
   OISEffect.cpp
@@ -39 +41 @@
 
 IF(WIN32)
-  LINK_DIRECTORIES(${DirectX_LIB_DIR})
-  TARGET_LINK_LIBRARIES( ois_orxonox
-    dxguid
-    dinput8
-  )
+  TARGET_LINK_LIBRARIES( ois_orxonox ${DirectX_LIBRARIES} )
 ENDIF(WIN32)
 
-INSTALL(TARGETS ois_orxonox LIBRARY DESTINATION lib)

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

@@ -49 +49 @@
 )
 
-INSTALL(TARGETS orxonox RUNTIME DESTINATION bin)
+IF (NOT WIN32)
+  INSTALL(TARGETS orxonox RUNTIME DESTINATION bin)
+ENDIF (NOT WIN32)

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

@@ -8 +8 @@
 
 ADD_LIBRARY(tinyxml_orxonox SHARED ${TINYXML_SRC_FILES})
-INSTALL(TARGETS tinyxml_orxonox LIBRARY DESTINATION lib)
+
+IF (NOT WIN32)
+  INSTALL(TARGETS tinyxml_orxonox LIBRARY DESTINATION lib)
+ENDIF (NOT WIN32)

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

@@ -7 +7 @@
 )
 
-#INSTALL(TARGETS tolualib_orxonox LIBRARY DESTINATION lib)
+IF (NOT WIN32)
+#  INSTALL(TARGETS tolualib_orxonox LIBRARY DESTINATION lib)
+ENDIF (NOT WIN32)
 
 SET(TOLUAGEN_SRC_FILES

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

@@ -15 +15 @@
 ADD_LIBRARY(util SHARED ${UTIL_SRC_FILES})
 TARGET_LINK_LIBRARIES(util ${OGRE_LIBRARY})
-INSTALL(TARGETS util LIBRARY DESTINATION lib)
+
+IF (NOT WIN32)
+  INSTALL(TARGETS util LIBRARY DESTINATION lib)
+ENDIF (NOT WIN32)