Changeset 1872 for code/trunk

Timestamp:

Oct 2, 2008, 7:00:54 PM (16 years ago)

Author:

rgrieder

Message:

• Modified cmake files to support library finding when using Visual Studio precompiled dependencies
• Removed vorbisenc executable from library dependency

Location:

code/trunk

Files:

• CMakeLists.txt (modified) (2 diffs)
• cmake/FindALUT.cmake (modified) (2 diffs)
• cmake/FindBoost.cmake (modified) (4 diffs)
• cmake/FindCEGUI.cmake (modified) (2 diffs)
• cmake/FindDirectX.cmake (modified) (2 diffs)
• cmake/FindENet.cmake (modified) (2 diffs)
• cmake/FindOGRE.cmake (modified) (2 diffs)
• cmake/FindOggVorbis.cmake (modified) (8 diffs)
• cmake/FindOpenAL.cmake (modified) (2 diffs)
• cmake/FindTCL.cmake (modified) (2 diffs)
• cmake/FindZLIB.cmake (modified) (2 diffs)

code/trunk/CMakeLists.txt

@@ -6 +6 @@
   cmake_policy(SET CMP0003 NEW)
 ENDIF (COMMAND cmake_policy)
+
+# Allow for simple IF constructs (makes code a lot more readable)
+#SET(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
 
 # This sets where to look for modules (e.g. "Find*.cmake" files)
@@ -68 +71 @@
 # SET (VERBOSE_FIND true)
 
+# Set the library directory when using precompiled tarballs for the dependencies under windows
+IF (WIN32)
+  IF (MSVC)
+    IF ($ENV{ORXONOX_DEV})
+      SET (DEPENDENCY_DIR ${CMAKE_SOURCE_DIR}/../lib_dist/dependencies/)
+    ELSE ($ENV{ORXONOX_DEV})
+      SET (DEPENDENCY_DIR ${CMAKE_SOURCE_DIR}/dependencies/)
+    ENDIF ($ENV{ORXONOX_DEV})
+    SET(Boost_LIB_SUFFIX_DEBUG vc80-mt-gd-1_35)
+  ENDIF (MSVC)
+ENDIF (WIN32)
+MESSAGE(STATUS ${DEPENDENCY_DIR})
+
 # Performs the search and sets the variables
 FIND_PACKAGE(OGRE)

code/trunk/cmake/FindALUT.cmake

@@ -49 +49 @@
   /opt/include
   ../libs/freealut-1.1.0/include
+  ${DEPENDENCY_DIR}/freealut-1.1.0/include
   )
 
@@ -88 +89 @@
     ../libs/freealut-1.1.0/src/.libs
     ../libs/freealut-1.1.0/lib
+    ${DEPENDENCY_DIR}/freealut-1.1.0/lib
     )
 ENDIF(${ALUT_INCLUDE_DIR} MATCHES ".framework")

code/trunk/cmake/FindBoost.cmake

@@ -1 +1 @@
 # THIS FILE HAS BEEN MODIFIED TO WORK ON THE TARDIS INFRASTURUCTURE of THE ETH.
-# use with cation
+# use with caution
 # Nicolas Schlumberger <nico AT orxonx DOT net> (C) 2007
 #
@@ -118 +118 @@
     ../libs/boost_1_34_1
 #    ../libs/boost-1_35_0
+    ${DEPENDENCY_DIR}/boost-1.35.0/include
 
 # Help the user find it if we cannot.
@@ -187 +188 @@
   mgw34-mt-1_34_1
   mgw34-mt-1_35
+  vc80-mt-1_35
+  vc80-mt-gd-1_35
 )
 
@@ -225 +228 @@
 # For MSVC builds find debug library
   IF(WIN32 AND MSVC AND Boost_${name}_LIBRARY)
-    FIND_LIBRARY(Boost_${name}_LIBRARY_DEBUG ${Boost_LIB_PREFIX}boost_${name}-${Boost_LIB_SUFFIX_DEBUG})
+    FIND_LIBRARY(Boost_${name}_LIBRARY_DEBUG
+      NAMES ${Boost_LIB_PREFIX}boost_${name}-${Boost_LIB_SUFFIX_DEBUG}
+      PATHS ${Boost_LIBRARY_DIRS})
 
     IF(MSVC_IDE)

code/trunk/cmake/FindCEGUI.cmake

@@ -26 +26 @@
     FIND_PATH(CEGUI_INCLUDE_DIR CEGUI.h
         ../libs/cegui-0.6.1/include
+        ${DEPENDENCY_DIR}/cegui-0.6.1/include
     )
 
@@ -31 +32 @@
     FIND_LIBRARY(CEGUI_LIBDIR NAMES ${CEGUI_LIBRARIES} PATHS
         ../libs/cegui-0.6.1/bin
+        ${DEPENDENCY_DIR}/cegui-0.6.1/lib
     )
 

code/trunk/cmake/FindDirectX.cmake

@@ -17 +17 @@
   FIND_PATH(DirectX_INCLUDE_DIR "dinput.h"
     C:/DXSDK/Include
+    $ENV{DXSDK_DIR}/Include
   )
 
@@ -22 +23 @@
     C:/DXSDK/Lib
     C:/DXSDK/Lib/x86
+    $ENV{DXSDK_DIR}/lib/x86
   )
 

code/trunk/cmake/FindENet.cmake

@@ -22 +22 @@
     /usr/pack/enet-2007-sd/include
     ../libs/enet-1.1/include
+    ${DEPENDENCY_DIR}/enet-1.2/include
     )
 
@@ -28 +29 @@
     PATHS /usr/lib /usr/local/lib /usr/pack/enet-2007-sd/i686-debian-linux3.1/lib/
     ../libs/enet-1.1
+    ${DEPENDENCY_DIR}/enet-1.2/lib
     )
 

code/trunk/cmake/FindOGRE.cmake

@@ -22 +22 @@
     FIND_PATH(OGRE_INCLUDE_DIR Ogre.h
         ../libs/ogre/OgreMain/include
+        ${DEPENDENCY_DIR}/ogre-1.4.9/include
     )
 
@@ -27 +28 @@
     FIND_LIBRARY(OGRE_LIBDIR NAMES ${OGRE_LIBRARIES} PATHS
         ../libs/ogre/Samples/Common/bin/Release
+        ${DEPENDENCY_DIR}/ogre-1.4.9/lib
     )
 

code/trunk/cmake/FindOggVorbis.cmake

@@ -29 +29 @@
   /opt/include
   ../libs/libogg-1.1.3/include
+  ${DEPENDENCY_DIR}/libogg-1.1.3/include
   )
 
@@ -41 +42 @@
   /opt/include
   ../libs/libvorbis-1.2.0/include
+  ${DEPENDENCY_DIR}/libvorbis-1.2.0/include
   )
 
@@ -58 +60 @@
   /opt/lib
   ../libs/libogg-1.1.3/src/.libs
+  ${DEPENDENCY_DIR}/libogg-1.1.3/lib
   )
 
@@ -71 +74 @@
   /opt/lib
   ../libs/libvorbis-1.2.0/lib/.libs
+  ${DEPENDENCY_DIR}/libvorbis-1.2.0/lib
   )
 
-FIND_LIBRARY(VORBISENC_LIBRARY
-  NAMES vorbisenc
-  PATHS
-  /usr/pack/oggvorbis-1.0-ds/i686-debian-linux3.1/lib
-  /usr/local/lib
-  /usr/lib
-  /sw/lib
-  /opt/local/lib
-  /opt/csw/lib
-  /opt/lib
-  ../libs/libvorbis-1.2.0/lib/.libs
-  )
+#FIND_LIBRARY(VORBISENC_LIBRARY
+#  NAMES vorbisenc
+#  PATHS
+#  /usr/pack/oggvorbis-1.0-ds/i686-debian-linux3.1/lib
+#  /usr/local/lib
+#  /usr/lib
+#  /sw/lib
+#  /opt/local/lib
+#  /opt/csw/lib
+#  /opt/lib
+#  ../libs/libvorbis-1.2.0/lib/.libs
+#  )
 
 FIND_LIBRARY(VORBISFILE_LIBRARY
@@ -97 +101 @@
   /opt/lib
   ../libs/libvorbis-1.2.0/lib/.libs
+  ${DEPENDENCY_DIR}/libvorbis-1.2.0/lib
   )
 
@@ -123 +128 @@
 SET (VORBIS_FOUND "NO")
 
-IF (VORBIS_INCLUDE_DIR AND VORBIS_LIBRARY AND VORBISENC_LIBRARY AND VORBISFILE_LIBRARY)
+IF (VORBIS_INCLUDE_DIR AND VORBIS_LIBRARY AND VORBISFILE_LIBRARY)# AND VORBISENC_LIBRARY)
   SET (VORBIS_FOUND "YES")
   IF (NOT VORBIS_FIND_QUIETLY)
@@ -130 +135 @@
       MESSAGE (STATUS "  include path: ${VORBIS_INCLUDE_DIR}")
       MESSAGE (STATUS "  library path: ${VORBIS_LIBRARY}")
-      MESSAGE (STATUS "  library path: ${VORBISENC_LIBRARY}")
+      #MESSAGE (STATUS "  library path: ${VORBISENC_LIBRARY}")
       MESSAGE (STATUS "  library path: ${VORBISFILE_LIBRARY}")
       MESSAGE (STATUS "  libraries:    vorbis vorbisenc vorbisfile")
     ENDIF (VERBOSE_FIND)
   ENDIF (NOT VORBIS_FIND_QUIETLY)
-ELSE (VORBIS_INCLUDE_DIR AND VORBIS_LIBRARY AND VORBISENC_LIBRARY AND VORBISFILE_LIBRARY)
+ELSE (VORBIS_INCLUDE_DIR AND VORBIS_LIBRARY AND VORBISFILE_LIBRARY)# AND VORBISENC_LIBRARY)
   IF (NOT VORBIS_INCLUDE_DIR)
     MESSAGE (SEND_ERROR "Vorbis include path was not found.")
@@ -142 +147 @@
     MESSAGE (SEND_ERROR "Vorbis library \"vorbis\" was not found.")
   ENDIF (NOT VORBIS_LIBRARY)
-  IF (NOT VORBISENC_LIBRARY)
-    MESSAGE (SEND_ERROR "Vorbis library \"vorbisenc\" was not found.")
-  ENDIF (NOT VORBISENC_LIBRARY)
+  #IF (NOT VORBISENC_LIBRARY)
+  #  MESSAGE (SEND_ERROR "Vorbis library \"vorbisenc\" was not found.")
+  #ENDIF (NOT VORBISENC_LIBRARY)
   IF (NOT VORBISFILE_LIBRARY)
     MESSAGE (SEND_ERROR "Vorbis library \"vorbisfile\" was not found.")

code/trunk/cmake/FindOpenAL.cmake

@@ -48 +48 @@
   /opt/include
   ../libs/openal-0.0.8/common/include
+  ${DEPENDENCY_DIR}/openal-1.1/include
   )
 # I'm not sure if I should do a special casing for Apple. It is
@@ -85 +86 @@
     /opt/lib
     ../libs/openal-0.0.8/src/.libs
+    ${DEPENDENCY_DIR}/openal-1.1/lib
     )
 ENDIF(${OPENAL_INCLUDE_DIR} MATCHES ".framework")

code/trunk/cmake/FindTCL.cmake

@@ -30 +30 @@
   ../libs/tcl8.5.2/unix
   ../libs/tcl8.5.2/macosx
+  ${DEPENDENCY_DIR}/tcl-8.5.2/lib
 )
 
 FIND_LIBRARY(TCL_LIBRARY
-  NAMES tcl tcl85 tcl8.5 tcl84 tcl8.4
+  NAMES tcl tcl85 tcl8.5 tcl84 tcl8.4 tcl85t
   PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
 )
@@ -57 +58 @@
   /usr/include/tcl8.4
   ../libs/tcl8.5.2/generic
+  ${DEPENDENCY_DIR}/tcl-8.5.2/include
 )
 

code/trunk/cmake/FindZLIB.cmake

@@ -37 +37 @@
   FIND_PATH(ZLIB_INCLUDE_DIR zlib.h
     ../libs/zlib/include
+    ${DEPENDENCY_DIR}/zlib-1.2.3/include
   )
 
@@ -42 +43 @@
     NAMES zlib
     PATHS ${ZLIB_LIBRARY_DIR}
+    ${DEPENDENCY_DIR}/zlib-1.2.3/lib
   )
 ENDIF(WIN32)