Changeset 8283 for code/branches/kicklib2/cmake/LibraryConfig.cmake
- Timestamp:
- Apr 21, 2011, 6:32:28 PM (13 years ago)
- Location:
- code/branches/kicklib2
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/kicklib2
- Property svn:mergeinfo changed
/code/branches/kicklib merged: 7940-7948,7950-7951,7953,7956-7957,7959-7961,7964-7965,7967-7969,7971,7973-7974
- Property svn:mergeinfo changed
-
code/branches/kicklib2/cmake/LibraryConfig.cmake
r8264 r8283 93 93 # Performs the search and sets the variables # 94 94 95 FIND_PACKAGE(OGRE 1.4 REQUIRED) 96 #FIND_PACKAGE(ENet 1.1 REQUIRED) 95 FIND_PACKAGE(OGRE 1.6 REQUIRED) 96 #FIND_PACKAGE(ENet 1.1 REQUIRED) 97 FIND_PACKAGE(Lua5.1 REQUIRED) 97 98 FIND_PACKAGE(Ogg REQUIRED) 98 99 FIND_PACKAGE(Vorbis REQUIRED) … … 111 112 ##### CEGUI ##### 112 113 # We make use of the CEGUI script module called CEGUILua. 113 # However there is a small issue with that: We use Tolua, a C++ binding 114 # generator ourselves. And we also have to use our bindings in the same 115 # lua state is CEGUILua's. Unfortunately this implies that both lua runtime 116 # version are equal or else you get segmentation faults. 117 # In order to match the Lua versions we decided to ship CEGUILua in our 118 # repository, mainly because there is no way to determine which version of 119 # Lua CEGUILua was linked against (you'd have to specify yourself) and secondly 120 # because we can then choose the Lua version. Future plans might involve only 121 # accepting Lua 5.1. 122 123 # Insert all internally supported CEGUILua versions here 124 SET(CEGUILUA_INTERNAL_SUPPORT 0.5.0 0.6.0 0.6.1 0.6.2) 125 OPTION(CEGUILUA_USE_EXTERNAL_LIBRARY "Force the use of external CEGUILua library" OFF) 126 FIND_PACKAGE(CEGUI 0.5 REQUIRED) 127 128 ##### Lua ##### 129 IF(CEGUILUA_USE_EXTERNAL_LIBRARY) 130 COMPARE_VERSION_STRINGS(${CEGUI_VERSION} "0.6" _version_comparison) 131 IF(version_comparison LESS 0) 132 SET(LUA_VERSION_REQUEST 5.0) 133 ELSE() 134 SET(LUA_VERSION_REQUEST 5.1) 135 ENDIF() 136 ELSE() 137 SET(LUA_VERSION_REQUEST 5) 138 ENDIF() 139 FIND_PACKAGE(Lua ${LUA_VERSION_REQUEST} EXACT REQUIRED) 114 # However there is a small issue with that: Both CEGUILua and Orxonox use 115 # Lua library functions on the same objects. And it turns out that in this case 116 # the linked library must be EXACTLY the same. 117 # Since Lua v5.1 has been out for a long while, this does not seem to be a 118 # problem anymore, at least as long as Lua 5.2 is not released. 119 FIND_PACKAGE(CEGUI 0.6 REQUIRED) 140 120 141 121 ##### OpenAL ##### … … 177 157 # Note: Default option in the libraries vary, but our default option is dynamic 178 158 IF(WIN32) 179 OPTION(LINK_BOOST_DYNAMIC "Link Boost dynamically on Windows" TRUE) 180 OPTION(LINK_CEGUI_DYNAMIC "Link CEGUI dynamicylly on Windows" TRUE) 181 #OPTION(LINK_ENET_DYNAMIC "Link ENet dynamically on Windows" TRUE) 182 OPTION(LINK_OGRE_DYNAMIC "Link OGRE dynamically on Windows" TRUE) 183 OPTION(LINK_TCL_DYNAMIC "Link TCL dynamically on Windows" TRUE) 184 OPTION(LINK_ZLIB_DYNAMIC "Link ZLib dynamically on Windows" TRUE) 185 COMPARE_VERSION_STRINGS("${LUA_VERSION}" "5.1" _version_comparison) 186 IF(_version_comparison LESS 0) 187 OPTION(LINK_LUA_DYNAMIC "Link Lua dynamically on Windows" FALSE) 188 ELSE(_version_comparison LESS 0) 189 OPTION(LINK_LUA_DYNAMIC "Link Lua dynamically on Windows" TRUE) 190 ENDIF(_version_comparison LESS 0) 159 OPTION(LINK_BOOST_DYNAMIC "Link Boost dynamically on Windows" TRUE) 160 OPTION(LINK_CEGUI_DYNAMIC "Link CEGUI dynamicylly on Windows" TRUE) 161 #OPTION(LINK_ENET_DYNAMIC "Link ENet dynamically on Windows" TRUE) 162 OPTION(LINK_OGRE_DYNAMIC "Link OGRE dynamically on Windows" TRUE) 163 OPTION(LINK_TCL_DYNAMIC "Link TCL dynamically on Windows" TRUE) 164 OPTION(LINK_ZLIB_DYNAMIC "Link ZLib dynamically on Windows" TRUE) 165 OPTION(LINK_LUA5.1_DYNAMIC "Link Lua dynamically on Windows" TRUE) 191 166 192 167 IF(DEPENDENCY_PACKAGE_ENABLE) … … 194 169 LINK_BOOST_DYNAMIC LINK_CEGUI_DYNAMIC #LINK_ENET_DYNAMIC 195 170 LINK_OGRE_DYNAMIC LINK_TCL_DYNAMIC LINK_ZLIB_DYNAMIC 196 LINK_LUA _DYNAMIC171 LINK_LUA5.1_DYNAMIC 197 172 ) 198 173 ENDIF()
Note: See TracChangeset
for help on using the changeset viewer.