Changeset 2510 for code/branches/buildsystem2/cmake
- Timestamp:
- Dec 17, 2008, 9:05:10 PM (15 years ago)
- Location:
- code/branches/buildsystem2
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/buildsystem2
- Property svn:mergeinfo changed
/code/branches/buildsystem merged: 2278-2279,2318,2322,2325-2326,2335-2336,2338-2339,2359-2360,2384,2392,2399
- Property svn:mergeinfo changed
-
code/branches/buildsystem2/cmake/CheckOrxonoxWinDeps.cmake
r2509 r2510 33 33 IF (MINGW) 34 34 MESSAGE(STATUS "Running on MinGW. Using customized paths.") 35 SET(MINGW_LIBRARY_DIR " ../libs")35 SET(MINGW_LIBRARY_DIR "${CMAKE_SOURCE_DIR}/../libs") 36 36 #SET(Boost_ADDITIONAL_VERSIONS "1.36") 37 SET(BOOST_INCLUDEDIR ".${MINGW_LIBRARY_DIR}/boost_1_34_1") 38 SET(BOOST_LIBRARYDIR ".${MINGW_LIBRARY_DIR}/boost_1_34_1/stage/lib") 39 SET(ENV{ENETDIR} ".${MINGW_LIBRARY_DIR}/enet-1.1") 40 SET(ENV{ALUTDIR} ".${MINGW_LIBRARY_DIR}/freealut-1.1.0") 41 SET(ENV{OPENALDIR} ".${MINGW_LIBRARY_DIR}/openal-0.0.8/common") 42 SET(ENV{LUA_DIR} ".${MINGW_LIBRARY_DIR}/lua-5.1.3") 43 SET(ENV{OGGVORBISDIR} ".${MINGW_LIBRARY_DIR}/libogg-1.1.3") 44 #SET(TCL_INCLUDE_PATH "/usr/pack/tcltk-8.4.9.linux-mo/include") 45 SET(ENV{CEGUIDIR} ".${MINGW_LIBRARY_DIR}/cegui-0.6.1") 46 SET(ENV{OGREDIR} ".${MINGW_LIBRARY_DIR}/ogre/OgreMain;.${MINGW_LIBRARY_DIR}/ogre/Samples/Common/bin/Release") 37 SET(BOOST_INCLUDEDIR "${MINGW_LIBRARY_DIR}/boost_1_34_1") 38 SET(BOOST_LIBRARYDIR "${MINGW_LIBRARY_DIR}/boost_1_34_1/stage/lib") 39 SET(ENV{ENETDIR} "${MINGW_LIBRARY_DIR}/enet-1.1") 40 SET(ENV{ALUTDIR} "${MINGW_LIBRARY_DIR}/freealut-1.1.0") 41 SET(ENV{OPENALDIR} "${MINGW_LIBRARY_DIR}/openal-0.0.8/common") 42 SET(ENV{LUA_DIR} "${MINGW_LIBRARY_DIR}/lua-5.1.3") 43 SET(ENV{OGGVORBISDIR} "${MINGW_LIBRARY_DIR}/oggvorbis-1.1.3-1.2.0") 44 SET(TCL_INCLUDE_PATH "${MINGW_LIBRARY_DIR}/tcl8.5.2/generic") 45 SET(TCL_LIBRARY_PATH "${MINGW_LIBRARY_DIR}/tcl8.5.2/win") 46 SET(ENV{CEGUIDIR} "${MINGW_LIBRARY_DIR}/cegui-0.6.1") 47 SET(ENV{OGREDIR} "${MINGW_LIBRARY_DIR}/ogre/OgreMain;${MINGW_LIBRARY_DIR}/ogre/Samples/Common/bin/Release") 48 SET(ZLIB_INCLUDE_DIR "${MINGW_LIBRARY_DIR}/zlib/include") 49 SET(ZLIB_LIB_DIR "${MINGW_LIBRARY_DIR}/zlib") 50 IF (NOT ENV{DXSDK_DIR}) 51 SET(ENV{DXSDK_DIR} "${MINGW_LIBRARY_DIR}/DXSDK") 52 ENDIF (NOT ENV{DXSDK_DIR}) 47 53 ENDIF (MINGW) 54 55 #MARK_AS_ADVANCED(MINGW_LIBRARY_DIR) -
code/branches/buildsystem2/cmake/CheckTardis.cmake
r2509 r2510 4 4 ################################################# 5 5 6 # only run this test on a lunix/unix machine7 6 IF (UNIX) 8 FIND_PROGRAM(UNAME_CMD "uname" 9 PATHS "/usr/bin /bin") 10 IF(NOT UNAME_CMD) 11 MESSAGE(ERROR "Unable to find uname. Tardis-Check cannot be done.") 12 ENDIF(NOT UNAME_CMD) 13 14 # run uname -n to get nodename 15 EXECUTE_PROCESS( 16 COMMAND "${UNAME_CMD}" "-n" 17 RESULT_VARIABLE UNAME_RV 18 ERROR_VARIABLE UNAME_EV 19 OUTPUT_VARIABLE UNAME_OV) 20 21 IF (NOT "${UNAME_RV}" STREQUAL "0") 22 MESSAGE(ERROR "ERROR: uname terminated unclean.") 23 ENDIF (NOT "${UNAME_RV}" STREQUAL "0") 24 25 # check wheter we are on a tardis machine 26 IF ("${UNAME_OV}" MATCHES "tardis") 7 FILE(STRINGS /etc/hostname HOSTNAME LIMIT_COUNT 1) 8 IF ("${HOSTNAME}" MATCHES "^tardis-[a-z][0-9][0-9]$") 27 9 SET (IS_TARDIS ON) 28 ENDIF ("${UNAME_OV}" MATCHES "tardis") 29 10 ENDIF ("${HOSTNAME}" MATCHES "^tardis-[a-z][0-9][0-9]$") 30 11 ENDIF (UNIX) 31 32 MARK_AS_ADVANCED(IS_TARDIS) 12 MARK_AS_ADVANCED(HOSTNAME IS_TARDIS) 33 13 34 14 IF (IS_TARDIS) … … 48 28 SET(ENV{OGREDIR} "/usr/pack/ogre-1.4.5-sd;/usr/pack/ogre-1.4.5-sd/i686-debian-linux3.1") 49 29 ENDIF (IS_TARDIS) 50 51 MARK_AS_ADVANCED(UNAME_CMD IS_TARDIS) -
code/branches/buildsystem2/cmake/FindCEGUI.cmake
r2509 r2510 29 29 ) 30 30 31 #SET(CEGUI_LIBRARIES debug CEGUIBase_d optimized CEGUIBase) 32 FIND_LIBRARY(CEGUI_LIBRARY 33 NAMES CEGUIBase 34 PATHS 35 $ENV{CEGUIDIR} 36 /usr/local 37 /usr 38 PATH_SUFFIXES lib 39 ) 31 IF(WIN32) 32 FIND_LIBRARY(CEGUI_LIBRARY_ 33 NAMES CEGUIBase 34 PATHS 35 $ENV{CEGUIDIR} 36 PATH_SUFFIXES lib 37 ) 38 FIND_LIBRARY(CEGUI_LIBRARY_d 39 NAMES CEGUIBase_d 40 PATHS 41 $ENV{CEGUIDIR} 42 PATH_SUFFIXES lib 43 ) 44 IF(CEGUI_LIBRARY_) 45 IF(CEGUI_LIBRARY_d) 46 SET(CEGUI_LIBRARY optimized ${CEGUI_LIBRARY_} debug ${CEGUI_LIBRARY_d}) 47 ELSE(CEGUI_LIBRARY_d) 48 SET(CEGUI_LIBRARY ${CEGUI_LIBRARY_}) 49 ENDIF(CEGUI_LIBRARY_d) 50 ENDIF(CEGUI_LIBRARY_) 51 ELSE(WIN32) 52 FIND_LIBRARY(CEGUI_LIBRARY 53 NAMES CEGUIBase 54 PATHS 55 $ENV{CEGUIDIR} 56 /usr/local 57 /usr 58 PATH_SUFFIXES lib 59 ) 60 ENDIF(WIN32) 40 61 41 62 # IF (NOT CEGUI_SCRIPT_LIBDIR) … … 65 86 MARK_AS_ADVANCED( 66 87 CEGUI_LIBRARY 88 CEGUI_LIBRARY_ 89 CEGUI_LIBRARY_d 67 90 CEGUI_INCLUDE_DIR 68 91 #CEGUI_SCRIPT_LIBRARIES -
code/branches/buildsystem2/cmake/FindDirectX.cmake
r1889 r2510 9 9 # > www.orxonox.net < 10 10 11 IF (DirectX_INCLUDE_DIR AND DirectX_LIB_DIR) 12 SET(DirectX_FIND_QUIETLY TRUE) 13 ENDIF (DirectX_INCLUDE_DIR AND DirectX_LIB_DIR) 14 15 set(DirectX_FOUND "NO") 16 17 FIND_PATH(DirectX_INCLUDE_DIR "dinput.h" 18 ../libs/DXSDK/Include 19 $ENV{DXSDK_DIR}/Include 11 FIND_PATH(DirectX_INCLUDE_DIR dinput.h 12 PATHS 13 $ENV{DXSDK_DIR} 14 PATH_SUFFIXES include Include 20 15 ) 21 16 22 FIND_PATH(DirectX_LIB_DIR "dinput8.lib"23 ../libs/DXSDK/Lib24 ../libs/DXSDK/Lib/x8625 $ENV{DXSDK_DIR}/lib/x8617 FIND_PATH(DirectX_LIB_DIR dinput8.lib 18 PATHS 19 $ENV{DXSDK_DIR} 20 PATH_SUFFIXES lib Lib lib/x86 Lib/x86 26 21 ) 27 22 28 IF (DirectX_INCLUDE_DIR AND DirectX_LIB_DIR) 29 SET (DirectX_FOUND "YES") 30 ENDIF (DirectX_INCLUDE_DIR AND DirectX_LIB_DIR) 23 INCLUDE(FindPackageHandleStandardArgs) 24 FIND_PACKAGE_HANDLE_STANDARD_ARGS(DirectX DEFAULT_MSG DirectX_INCLUDE_DIR DirectX_LIB_DIR) 31 25 32 IF (DirectX_FOUND)33 IF (NOT DirectX_FIND_QUIETLY)34 MESSAGE(STATUS "DirectX was found.")35 IF (VERBOSE_FIND)36 MESSAGE (STATUS " include path: ${DirectX_INCLUDE_DIR}")37 MESSAGE (STATUS " library path: ${DirectX_LIB_DIR}")38 MESSAGE (STATUS " libraries: dinput8.lib")39 ENDIF (VERBOSE_FIND)40 ENDIF (NOT DirectX_FIND_QUIETLY)41 ELSE (DirectX_FOUND)42 IF (NOT DirectX_INCLUDE_DIR)43 MESSAGE(SEND_ERROR "DirectX include path was not found.")44 ENDIF (NOT DirectX_INCLUDE_DIR)45 IF (NOT DirectX_LIB_DIR)46 MESSAGE(SEND_ERROR "DirectX library was not found.")47 ENDIF (NOT DirectX_LIB_DIR)48 ENDIF (DirectX_FOUND)49 26 ENDIF(WIN32) 27 28 MARK_AS_ADVANCED(DirectX_INCLUDE_DIR DirectX_LIB_DIR) -
code/branches/buildsystem2/cmake/FindENet.cmake
r2509 r2510 46 46 ENDIF (ENET_FOUND) 47 47 48 MARK_AS_ADVANCED(ENet_LIBRARY ENet_ INCLUDE_DIR)48 MARK_AS_ADVANCED(ENet_LIBRARY ENet_LIBRARIES ENet_INCLUDE_DIR) -
code/branches/buildsystem2/cmake/FindOGRE.cmake
r2509 r2510 23 23 ) 24 24 25 #SET(OGRE_LIBRARIES debug OgreMain_d optimized OgreMain) 26 FIND_LIBRARY(OGRE_LIBRARY 27 NAMES OgreMain 28 PATHS 29 $ENV{OGREDIR} 30 /usr/local 31 /usr 32 PATH_SUFFIXES lib 33 ) 25 IF(WIN32) 26 FIND_LIBRARY(OGRE_LIBRARY_ 27 NAMES OgreMain 28 PATHS 29 $ENV{OGREDIR} 30 PATH_SUFFIXES lib 31 ) 32 FIND_LIBRARY(OGRE_LIBRARY_d 33 NAMES OgreMain_d 34 PATHS 35 $ENV{OGREDIR} 36 PATH_SUFFIXES lib 37 ) 38 IF(OGRE_LIBRARY_) 39 IF(OGRE_LIBRARY_d) 40 SET(OGRE_LIBRARY optimized ${OGRE_LIBRARY_} debug ${OGRE_LIBRARY_d}) 41 ELSE(OGRE_LIBRARY_d) 42 SET(OGRE_LIBRARY ${OGRE_LIBRARY_}) 43 ENDIF(OGRE_LIBRARY_d) 44 ENDIF(OGRE_LIBRARY_) 45 ELSE(WIN32) 46 FIND_LIBRARY(OGRE_LIBRARY 47 NAMES OgreMain 48 PATHS 49 $ENV{OGREDIR} 50 /usr/local 51 /usr 52 PATH_SUFFIXES lib 53 ) 54 ENDIF(WIN32) 34 55 35 56 INCLUDE(FindPackageHandleStandardArgs) … … 41 62 MARK_AS_ADVANCED( 42 63 OGRE_LIBRARY 64 OGRE_LIBRARY_ 65 OGRE_LIBRARY_d 43 66 OGRE_INCLUDE_DIR 44 67 ) -
code/branches/buildsystem2/cmake/FindOggVorbis.cmake
r2509 r2510 73 73 VORBIS_LIBRARY 74 74 VORBISFILE_LIBRARY 75 #VORBISENC_LIBRARY 75 76 VORBIS_INCLUDE_DIR 76 77 ) -
code/branches/buildsystem2/cmake/UseTolua.cmake
r2509 r2510 18 18 SET(_tolua_executable_name toluaexe_orxonox) 19 19 GET_TARGET_PROPERTY(TOLUA_EXECUTABLE "${_tolua_executable_name}" LOCATION) 20 IF(MINGW_LIBRARY_DIR) 21 SET(_tolua_command_wd "WORKING_DIRECTORY;${MINGW_LIBRARY_DIR}/lua-5.1.3/lib") 22 ELSE(MINGW_LIBRARY_DIR) 23 SET(_tolua_command_wd) 24 ENDIF(MINGW_LIBRARY_DIR) 20 25 21 26 MACRO(TOLUA _tolua_package _tolua_srcfiles_varname) … … 45 50 DEPENDS "${_tolua_executable_name}" ${TOLUA_PARSER_DEPENDENCIES} 46 51 IMPLICIT_DEPENDS CXX ${_tolua_inputfiles} 47 WORKING_DIRECTORY "${LIBRARY_OUTPUT_PATH}"52 ${_tolua_command_wd} 48 53 ) 49 54 ENDMACRO(TOLUA)
Note: See TracChangeset
for help on using the changeset viewer.