Changeset 2510 for code/branches/buildsystem2/CMakeLists.txt
- Timestamp:
- Dec 17, 2008, 9:05:10 PM (15 years ago)
- Location:
- code/branches/buildsystem2
- Files:
-
- 2 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/CMakeLists.txt
r2509 r2510 33 33 SET(CMAKE_C_FLAGS "$ENV{CFLAGS} -Wall -Wextra -Wno-unused-parameter") 34 34 SET(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} -Wall -Wextra -Wno-unused-parameter") 35 SET(CMAKE_C_FLAGS_DEBUG "-g -ggdb ")36 SET(CMAKE_CXX_FLAGS_DEBUG "-g -ggdb ")37 SET(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG ")38 SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG ")39 SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -DNDEBUG -g -ggdb ")40 SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -DNDEBUG -g -ggdb ")41 SET(CMAKE_C_FLAGS_MINSIZEREL "-Os -DNDEBUG ")42 SET(CMAKE_CXX_FLAGS_MINSIZEREL "-Os -DNDEBUG ")35 SET(CMAKE_C_FLAGS_DEBUG "-g -ggdb -fPIC") 36 SET(CMAKE_CXX_FLAGS_DEBUG "-g -ggdb -fPIC") 37 SET(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG -fPIC") 38 SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -fPIC") 39 SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -DNDEBUG -g -ggdb -fPIC") 40 SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -DNDEBUG -g -ggdb -fPIC") 41 SET(CMAKE_C_FLAGS_MINSIZEREL "-Os -DNDEBUG -fPIC") 42 SET(CMAKE_CXX_FLAGS_MINSIZEREL "-Os -DNDEBUG -fPIC") 43 43 44 44 SET(CMAKE_LD_FLAGS "$ENV{LDFLAGS}") … … 52 52 FIND_PACKAGE(OGRE REQUIRED) 53 53 FIND_PACKAGE(CEGUI REQUIRED) 54 # CEGUI_OGRE i ncluded in source54 # CEGUI_OGRE is already included in source 55 55 #FIND_PACKAGE(CEGUI_OGRE REQUIRED) 56 56 FIND_PACKAGE(ENet REQUIRED) … … 61 61 FIND_PACKAGE(ZLIB REQUIRED) 62 62 FIND_PACKAGE(DirectX REQUIRED) 63 FIND_PACKAGE(Lua50 REQUIRED)64 #FIND_PACKAGE(Lua51 QUIET)65 63 66 #don't require the whole tcl rat tail 64 # Require Lua 5.0 or 5.1 65 FIND_PACKAGE(Lua50 QUIET) 66 IF(NOT LUA50_FOUND) 67 # Remove variables set by Lua50 and try with Lua51 68 SET(LUA_INCLUDE_DIR) 69 SET(LUA_LIBRARY_lua) 70 SET(LUA_LIBRARY_lualib) 71 SET(LUA_LIBRARIES) 72 FIND_PACKAGE(Lua51 REQUIRED) 73 ENDIF(NOT LUA50_FOUND) 74 # Determine Lua version (Lua50 may also find Lua51) 75 FILE(STRINGS "${LUA_INCLUDE_DIR}/lua.h" LUA_VERSION REGEX "LUA_VERSION") 76 STRING(REGEX REPLACE "^.*\"Lua (.*)\".*$" "\\1" LUA_VERSION "${LUA_VERSION}") 77 78 # Don't require the whole tcl rat tail 67 79 FIND_PACKAGE(TCL QUIET) 68 80 IF(NOT TCL_FOUND)
Note: See TracChangeset
for help on using the changeset viewer.