Changeset 8123 for code/branches/kicklib/cmake
- Timestamp:
- Mar 26, 2011, 5:42:23 PM (14 years ago)
- Location:
- code/branches/kicklib/cmake
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/kicklib/cmake/LibraryConfig.cmake
r8073 r8123 98 98 # Performs the search and sets the variables # 99 99 100 FIND_PACKAGE(OGRE 1.6REQUIRED)101 #FIND_PACKAGE(ENet 1.1REQUIRED)100 #FIND_PACKAGE(ENet 1.2 REQUIRED) 101 FIND_PACKAGE(CEGUI 0.6 REQUIRED) 102 102 FIND_PACKAGE(Lua5.1 REQUIRED) 103 103 FIND_PACKAGE(Ogg REQUIRED) … … 105 105 FIND_PACKAGE(ALUT REQUIRED) 106 106 FIND_PACKAGE(ZLIB REQUIRED) 107 IF(POCO_REQUIRED) 108 FIND_PACKAGE(POCO REQUIRED) 109 # Always link against POCO too because of threading 110 SET(OGRE_LIBRARY ${OGRE_LIBRARY} ${POCO_LIBRARY}) 111 ENDIF() 107 112 108 IF(WIN32) 113 109 FIND_PACKAGE(DbgHelp) … … 115 111 ENDIF() 116 112 117 ##### CEGUI #####118 # We make use of the CEGUI script module called CEGUILua.119 # However there is a small issue with that: Both CEGUILua and Orxonox use120 # Lua library functions on the same objects. And it turns out that in this case121 # the linked library must be EXACTLY the same.122 # Since Lua v5.1 has been out for a long while, this does not seem to be a123 # problem anymore, at least as long as Lua 5.2 is not released.124 FIND_PACKAGE(CEGUI 0.6 REQUIRED)125 113 126 114 ##### OpenAL ##### … … 165 153 ENDIF() 166 154 155 ##### OGRE ##### 156 FIND_PACKAGE(OGRE 1.6 REQUIRED) 157 # For Ogre >= 1.7, we might need a threading library 158 # Variables are either defined by dependency package config or by FindOGRE 159 IF(OGRE_NEEDS_POCO) 160 FIND_PACKAGE(POCO REQUIRED) 161 # Always link against POCO too because of threading 162 SET(OGRE_LIBRARY ${OGRE_LIBRARY} ${POCO_LIBRARY}) 163 ELSEIF(OGRE_NEEDS_BOOST) 164 # Always link against boost too because of threading 165 SET(OGRE_LIBRARY ${OGRE_LIBRARY} ${Boost_THREAD_LIBRARY}) 166 ENDIF() 167 167 168 168 169 ####### Static/Dynamic linking options ########## -
code/branches/kicklib/cmake/PackageConfig.cmake
r8071 r8123 33 33 COMPARE_VERSION_STRINGS(${DEPENDENCY_VERSION} 5 _result TRUE) 34 34 IF(NOT _result EQUAL -1 AND NOT APPLE) 35 SET( POCO_REQUIREDTRUE)35 SET(OGRE_NEEDS_POCO TRUE) 36 36 ENDIF() 37 37 -
code/branches/kicklib/cmake/PackageConfigOSX.cmake
r8121 r8123 49 49 SET(ENV{OGRE_PLUGIN_DIR} ${DEP_BINARY_DIR}) 50 50 51 # Linking to OGRE requires linking to the boost threading library 52 SET(OGRE_NEEDS_BOOST TRUE) 53 51 54 # For OS X 10.5 we have to ship modified headers to make it compile 52 55 # on gcc >= 4.2 (binaries stay the same)
Note: See TracChangeset
for help on using the changeset viewer.