cmake-stuff.diff
| b/code/nel/CMakeLists.txt Tue May 11 06:39:46 2010 -0700 | ||
|---|---|---|
| 72 | 72 |
FIND_PACKAGE(LibXml2 REQUIRED) |
| 73 | 73 |
FIND_PACKAGE(PNG REQUIRED) |
| 74 | 74 |
FIND_PACKAGE(Jpeg) |
| 75 |
FIND_PACKAGE(Xf86VidMode) |
|
| 76 |
FIND_PACKAGE(GL) |
|
| 75 | 77 |
|
| 76 | 78 |
NL_SETUP_BUILD() |
| 77 | 79 |
|
| b/code/nel/CMakeModules/FindGL.cmake Tue May 11 06:39:46 2010 -0700 | ||
|---|---|---|
| 1 |
# - Locate GL library |
|
| 2 |
# This module defines |
|
| 3 |
# OPENGL_LIBRARIES, the library to link against |
|
| 4 |
# GL_FOUND, if false, do not try to link to GL |
|
| 5 |
# OPENGL_INCLUDES, where to find headers. |
|
| 6 | ||
| 7 |
IF(OPENGL_LIBRARIES AND OPENGL_INCLUDES) |
|
| 8 |
# in cache already |
|
| 9 |
SET(GL_FIND_QUIETLY TRUE) |
|
| 10 |
ENDIF(OPENGL_LIBRARIES AND OPENGL_INCLUDES) |
|
| 11 | ||
| 12 | ||
| 13 |
FIND_PATH(OPENGL_INCLUDES |
|
| 14 |
gl.h |
|
| 15 |
PATHS |
|
| 16 |
$ENV{GL_DIR}/include/
|
|
| 17 |
/usr/local/include/ |
|
| 18 |
/usr/include/ |
|
| 19 |
/usr/include/nvidia/ |
|
| 20 |
/sw/include/ |
|
| 21 |
/opt/local/include/ |
|
| 22 |
/opt/csw/include/ |
|
| 23 |
/opt/include/ |
|
| 24 |
PATH_SUFFIXES GL |
|
| 25 |
) |
|
| 26 | ||
| 27 |
FIND_LIBRARY(OPENGL_LIBRARIES |
|
| 28 |
GL |
|
| 29 |
PATHS |
|
| 30 |
$ENV{GL_DIR}/lib
|
|
| 31 |
/usr/local/lib |
|
| 32 |
/usr/lib |
|
| 33 |
/usr/lib/nvidia/ |
|
| 34 |
/usr/local/X11R6/lib |
|
| 35 |
/usr/X11R6/lib |
|
| 36 |
/sw/lib |
|
| 37 |
/opt/local/lib |
|
| 38 |
/opt/csw/lib |
|
| 39 |
/opt/lib |
|
| 40 |
/usr/freeware/lib64 |
|
| 41 |
) |
|
| 42 | ||
| 43 |
IF(OPENGL_LIBRARIES AND OPENGL_INCLUDES) |
|
| 44 |
SET(GL_FOUND "YES") |
|
| 45 |
IF(NOT GL_FIND_QUIETLY) |
|
| 46 |
MESSAGE(STATUS "Found GL: ${OPENGL_LIBRARIES}")
|
|
| 47 |
ENDIF(NOT GL_FIND_QUIETLY) |
|
| 48 |
ELSE(OPENGL_LIBRARIES AND OPENGL_INCLUDES) |
|
| 49 |
IF(NOT GL_FIND_QUIETLY) |
|
| 50 |
MESSAGE(STATUS "Warning: Unable to find GL!") |
|
| 51 |
ENDIF(NOT GL_FIND_QUIETLY) |
|
| 52 |
ENDIF(OPENGL_LIBRARIES AND OPENGL_INCLUDES) |
|
| b/code/nel/CMakeModules/FindXf86VidMode.cmake Tue May 11 06:39:46 2010 -0700 | ||
|---|---|---|
| 1 |
# - Locate Jpeg library |
|
| 2 |
# This module defines |
|
| 3 |
# XF86VidMode_LIBRARY, the library to link against |
|
| 4 |
# XF86VidMode_FOUND, if false, do not try to link to XF86VidMode |
|
| 5 |
# XF86VidMode_INCLUDE_DIR, where to find headers. |
|
| 6 | ||
| 7 |
IF(XF86VidMode_LIBRARY AND XF86VidMode_INCLUDE_DIR) |
|
| 8 |
# in cache already |
|
| 9 |
SET(XF86VidMode_FIND_QUIETLY TRUE) |
|
| 10 |
ENDIF(XF86VidMode_LIBRARY AND XF86VidMode_INCLUDE_DIR) |
|
| 11 | ||
| 12 | ||
| 13 |
FIND_PATH(XF86VidMode_INCLUDE_DIR |
|
| 14 |
xf86vm.h |
|
| 15 |
PATHS |
|
| 16 |
$ENV{XF86VidMode_DIR}/include
|
|
| 17 |
/usr/include/X11/ |
|
| 18 |
/usr/X11R6/include/ |
|
| 19 |
PATH_SUFFIXES extensions |
|
| 20 |
) |
|
| 21 | ||
| 22 |
FIND_LIBRARY(XF86VidMode_LIBRARY |
|
| 23 |
Xxf86vm |
|
| 24 |
PATHS |
|
| 25 |
$ENV{XF86VidMode_DIR}/lib
|
|
| 26 |
/usr/X11R6/lib |
|
| 27 |
/usr/lib |
|
| 28 |
/sw/lib |
|
| 29 |
/opt/local/lib |
|
| 30 |
/opt/csw/lib |
|
| 31 |
/opt/lib |
|
| 32 |
/usr/freeware/lib64 |
|
| 33 |
) |
|
| 34 | ||
| 35 |
IF(XF86VidMode_LIBRARY AND XF86VidMode_INCLUDE_DIR) |
|
| 36 |
SET(XF86VidMode_FOUND "YES") |
|
| 37 |
ADD_DEFINITIONS(-DXF86VIDMODE) |
|
| 38 |
IF(NOT XF86VidMode_FIND_QUIETLY) |
|
| 39 |
MESSAGE(STATUS "Found XF86VidMode: ${XF86VidMode_LIBRARY}")
|
|
| 40 |
ENDIF(NOT XF86VidMode_FIND_QUIETLY) |
|
| 41 |
ELSE(XF86VidMode_LIBRARY AND XF86VidMode_INCLUDE_DIR) |
|
| 42 |
IF(NOT XF86VidMode_FIND_QUIETLY) |
|
| 43 |
MESSAGE(STATUS "Warning: Unable to find XF86VidMode!") |
|
| 44 |
ENDIF(NOT XF86VidMode_FIND_QUIETLY) |
|
| 45 |
ENDIF(XF86VidMode_LIBRARY AND XF86VidMode_INCLUDE_DIR) |
|
| b/code/nel/src/3d/driver/opengl/CMakeLists.txt Tue May 11 06:39:46 2010 -0700 | ||
|---|---|---|
| 9 | 9 |
ADD_LIBRARY(${NLDRV_OGL_LIB} SHARED ${SRC})
|
| 10 | 10 |
|
| 11 | 11 |
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
|
| 12 |
TARGET_LINK_LIBRARIES(${NLDRV_OGL_LIB} nel3d nelmisc ${OPENGL_LIBRARIES})
|
|
| 12 |
TARGET_LINK_LIBRARIES(${NLDRV_OGL_LIB} nel3d nelmisc ${OPENGL_LIBRARIES} ${XF86VidMode_LIBRARY})
|
|
| 13 | 13 |
SET_TARGET_PROPERTIES(${NLDRV_OGL_LIB} PROPERTIES
|
| 14 | 14 |
VERSION ${NL_VERSION}
|
| 15 | 15 |
PROJECT_LABEL "Driver, Video: OpenGL") |
| ... | ... | |
| 31 | 31 |
INSTALL(TARGETS ${NLDRV_OGL_LIB} LIBRARY DESTINATION lib RUNTIME DESTINATION bin COMPONENT drivers3d)
|
| 32 | 32 |
IF(WITH_MAXPLUGIN) |
| 33 | 33 |
INSTALL(TARGETS ${NLDRV_OGL_LIB} RUNTIME DESTINATION maxplugin COMPONENT drivers3d)
|
| 34 |
ENDIF(WITH_MAXPLUGIN) |
|
| 34 |
ENDIF(WITH_MAXPLUGIN) |
|
| b/code/ryzom/CMakeLists.txt Tue May 11 06:39:46 2010 -0700 | ||
|---|---|---|
| 80 | 80 |
FIND_PACKAGE(Lua50 REQUIRED) |
| 81 | 81 |
FIND_PACKAGE(CURL REQUIRED) |
| 82 | 82 |
FIND_PACKAGE(Libwww) |
| 83 |
FIND_PACKAGE(X11)
|
|
| 83 |
PKG_CHECK_MODULES(X11 x11)
|
|
| 84 | 84 | |
| 85 | 85 | |
| 86 | 86 |
NL_SETUP_BUILD() |
| b/code/ryzom/CMakeModules/FindLibwww.cmake Tue May 11 06:39:46 2010 -0700 | ||
|---|---|---|
| 38 | 38 |
/usr/freeware/lib64 |
| 39 | 39 |
) |
| 40 | 40 | |
| 41 |
FIND_LIBRARY(LIBMD5_LIBRARY |
|
| 42 |
md5 |
|
| 43 |
PATHS |
|
| 44 |
/usr/local/lib |
|
| 45 |
/usr/lib |
|
| 46 |
/usr/local/X11R6/lib |
|
| 47 |
/usr/X11R6/lib |
|
| 48 |
/sw/lib |
|
| 49 |
/opt/local/lib |
|
| 50 |
/opt/csw/lib |
|
| 51 |
/opt/lib |
|
| 52 |
/usr/freeware/lib64 |
|
| 53 |
) |
|
| 54 | ||
| 41 | 55 |
IF(LIBWWW_LIBRARY AND LIBWWW_INCLUDE_DIR) |
| 42 | 56 |
SET(LIBWWW_FOUND "YES") |
| 43 | 57 |
IF(NOT LIBWWW_FIND_QUIETLY) |
| ... | ... | |
| 49 | 63 |
ENDIF(NOT LIBWWW_FIND_QUIETLY) |
| 50 | 64 |
ENDIF(LIBWWW_LIBRARY AND LIBWWW_INCLUDE_DIR) |
| 51 | 65 | |
| 66 |
IF(LIBMD5_LIBRARY) |
|
| 67 |
SET(LIBMD5_FOUND "YES") |
|
| 68 |
IF(NOT LIBMD5_FIND_QUIETLY) |
|
| 69 |
MESSAGE(STATUS "Found LibMD5: ${LIBMD5_LIBRARY}")
|
|
| 70 |
ENDIF(NOT LIBMD5_FIND_QUIETLY) |
|
| 71 |
ELSE(LIBMD5_LIBRARY) |
|
| 72 |
IF(NOT LIBMD5_FIND_QUIETLY) |
|
| 73 |
MESSAGE(STATUS "Warning: Unable to find LibMD5!") |
|
| 74 |
ENDIF(NOT LIBMD5_FIND_QUIETLY) |
|
| 75 |
ENDIF(LIBMD5_LIBRARY) |
|
| b/code/ryzom/CMakeModules/nel.cmake Tue May 11 06:39:46 2010 -0700 | ||
|---|---|---|
| 66 | 66 |
SET(NL_RELEASE_CFLAGS "/Ox /Ob2 /Oi /Ot /Oy /GT /GF") |
| 67 | 67 |
SET(NL_RELEASEDEBUG_CFLAGS "/DNL_RELEASE_DEBUG /Ob2 /GF") |
| 68 | 68 |
ELSE(WIN32) |
| 69 |
SET(PLATFORM_CFLAGS "-ftemplate-depth-24 -D_REENTRANT -Wall -ansi -W -Wpointer-arith -Wsign-compare -Wno-deprecated-declarations -Wno-multichar -Wno-long-long -Wno-unused")
|
|
| 69 |
SET(PLATFORM_CFLAGS "-ftemplate-depth-30 -D_REENTRANT -Wall -ansi -W -Wpointer-arith -Wsign-compare -Wno-deprecated-declarations -Wno-multichar -Wno-long-long -Wno-unused")
|
|
| 70 | 70 |
IF(WITH_COVERAGE) |
| 71 | 71 |
SET(PLATFORM_CFLAGS "-fprofile-arcs -ftest-coverage ${PLATFORM_CFLAGS}")
|
| 72 | 72 |
ENDIF(WITH_COVERAGE) |
| b/code/ryzom/client/src/CMakeLists.txt Tue May 11 06:39:46 2010 -0700 | ||
|---|---|---|
| 53 | 53 |
${NELSNDDRV_LIBRARY}
|
| 54 | 54 |
client_sheets |
| 55 | 55 |
${NELPACS_LIBRARY}
|
| 56 |
${LIBWWW_LIBRARY}
|
|
| 56 |
${LIBWWW_LIBRARY}
|
|
| 57 |
${LIBMD5_LIBRARY}
|
|
| 57 | 58 |
${Boost_LIBRARIES}
|
| 58 | 59 |
${X11_LIBRARIES}
|
| 59 | 60 |
seven_zip |
| b/code/ryzom/tools/assoc_mem/CMakeLists.txt Tue May 11 06:39:46 2010 -0700 | ||
|---|---|---|
| 1 | 1 |
FILE(GLOB SRC *.cpp *.h) |
| 2 | 2 | |
| 3 |
LIST(REMOVE_ITEM SRC |
|
| 4 |
${CMAKE_CURRENT_SOURCE_DIR}/Backup\ 1\ of\ record.cpp
|
|
| 5 |
${CMAKE_CURRENT_SOURCE_DIR}/Backup\ 2\ of\ record.cpp)
|
|
| 6 | ||
| 3 | 7 |
ADD_EXECUTABLE(assoc_mem ${SRC})
|
| 4 | 8 | |
| 5 | 9 |
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS})
|
| b/code/ryzom/tools/stats_scan/CMakeLists.txt Tue May 11 06:39:46 2010 -0700 | ||
|---|---|---|
| 1 | 1 |
FILE(GLOB SRC *.cpp *.h) |
| 2 | 2 | |
| 3 |
LIST(REMOVE_ITEM SRC |
|
| 4 |
${CMAKE_CURRENT_SOURCE_DIR}/Backup\ 1\ of\ char_commands.cpp)
|
|
| 5 | ||
| 3 | 6 |
ADD_EXECUTABLE(stats_scan ${SRC})
|
| 4 | 7 | |
| 5 | 8 |
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIRS} ${NELNET_INCLUDE_DIRS})
|