cmake_ryzom_default_options.patch

jayme, 05/11/2010 09:58 am

Download (1.9 kB)

b/code/ryzom/CMakeLists.txt Tue May 11 09:56:16 2010 +0200
13 13 
# Load some macros.
14 14 
SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules;${CMAKE_MODULE_PATH}")
15 15 
INCLUDE(CMakeModules/nel.cmake)
16 
INCLUDE(CMakeModules/ryzom.cmake)
16 17 
INCLUDE(CMakeModules/ConfigureChecks.cmake)
17 18 






18
19


#-----------------------------------------------------------------------------






19
20


# Force out of source builds.






20
21


CHECK_OUT_OF_SOURCE()






21
22









23


#-----------------------------------------------------------------------------







24


# Set ryzom default options







25


RY_SETUP_DEFAULT_OPTIONS()







26








22
27


IF(WIN32)






23
28


  SET(CMAKE_INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../3rdParty/include;${CMAKE_INCLUDE_PATH}")






24
29


  SET(CMAKE_LIBRARY_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../3rdParty/lib;${CMAKE_LIBRARY_PATH}")






......




77
82








78
83


FIND_PACKAGE(Threads REQUIRED)






79
84


FIND_PACKAGE(LibXml2 REQUIRED)






80



FIND_PACKAGE(Lua50 REQUIRED)







85


IF(WITH_LUA51)







86


  FIND_PACKAGE(Lua51 REQUIRED)







87


ELSE(WITH_LUA51)







88


  FIND_PACKAGE(Lua50 REQUIRED)







89


ENDIF(WITH_LUA51)






81
90


FIND_PACKAGE(CURL REQUIRED)






82
91


FIND_PACKAGE(Libwww)






83
92


FIND_PACKAGE(X11)






......




132
141


NL_SETUP_BUILD_FLAGS()






133
142








134
143


ADD_SUBDIRECTORY(common)






135



ADD_SUBDIRECTORY(client)






136



ADD_SUBDIRECTORY(tools)







144


IF(WITH_CLIENT)







145


  ADD_SUBDIRECTORY(client)







146


ENDIF(WITH_CLIENT)







147


IF(WITH_TOOLS)







148


  ADD_SUBDIRECTORY(tools)







149


ENDIF(WITH_TOOLS)






137
150



















b/code/ryzom/CMakeModules/ryzom.cmake Tue May 11 09:56:16 2010 +0200








1


MACRO(RY_SETUP_DEFAULT_OPTIONS)







2


  OPTION(WITH_CLIENT      "Build Ryzom client"                                    ON)







3


  OPTION(WITH_TOOLS       "Build Ryzom tools"                                     ON)







4


  OPTION(WITH_LUA51       "Lua50 / Lua51 switch"                                  OFF)







5


ENDMACRO(RY_SETUP_DEFAULT_OPTIONS)