Fix CMake files to allow build server only

pull/541/head
Koncord 5 years ago
parent 6828d83a42
commit 090f13b334
No known key found for this signature in database
GPG Key ID: CBBFF7020054B62B

@ -266,11 +266,12 @@ if(NOT HAVE_STDINT_H)
message(FATAL_ERROR "stdint.h was not found" ) message(FATAL_ERROR "stdint.h was not found" )
endif() endif()
if(BUILD_OPENMW OR BUILD_OPENCS OR BUILD_OPENMW_MP)
IF(BUILD_OPENMW OR BUILD_OPENCS)
find_package(OpenSceneGraph 3.3.4 REQUIRED osgDB osgViewer osgText osgGA osgParticle osgUtil osgFX osgShadow) find_package(OpenSceneGraph 3.3.4 REQUIRED osgDB osgViewer osgText osgGA osgParticle osgUtil osgFX osgShadow)
include_directories(SYSTEM ${OPENSCENEGRAPH_INCLUDE_DIRS}) include_directories(SYSTEM ${OPENSCENEGRAPH_INCLUDE_DIRS})
endif()
IF(BUILD_OPENMW OR BUILD_OPENCS)
set(USED_OSG_PLUGINS set(USED_OSG_PLUGINS
osgdb_bmp osgdb_bmp
@ -648,7 +649,6 @@ endif(WIN32)
# Extern # Extern
IF(BUILD_OPENMW OR BUILD_OPENCS) IF(BUILD_OPENMW OR BUILD_OPENCS)
set(RECASTNAVIGATION_STATIC ON CACHE BOOL "Build recastnavigation static libraries") set(RECASTNAVIGATION_STATIC ON CACHE BOOL "Build recastnavigation static libraries")
add_subdirectory (extern/recastnavigation EXCLUDE_FROM_ALL) add_subdirectory (extern/recastnavigation EXCLUDE_FROM_ALL)
add_subdirectory (extern/osg-ffmpeg-videoplayer) add_subdirectory (extern/osg-ffmpeg-videoplayer)
add_subdirectory (extern/oics) add_subdirectory (extern/oics)

@ -7,6 +7,7 @@ include(LibFindMacros)
libfind_pkg_detect(LuaJit luajit libfind_pkg_detect(LuaJit luajit
FIND_PATH luajit.h FIND_PATH luajit.h
PATH_SUFFIXES luajit
FIND_LIBRARY NAMES luajit-5.1 luajit FIND_LIBRARY NAMES luajit-5.1 luajit
) )

@ -18,7 +18,7 @@ FIND_LIBRARY (RakNet_LIBRARY_RELEASE NAMES RakNetLibStatic
$ENV{RAKNET_ROOT}/lib $ENV{RAKNET_ROOT}/lib
) )
FIND_LIBRARY (RakNet_LIBRARY_DEBUG NAMES RakNetLibStatic FIND_LIBRARY (RakNet_LIBRARY_DEBUG NAMES RakNetLibStaticd
PATHS PATHS
ENV LD_LIBRARY_PATH ENV LD_LIBRARY_PATH
ENV LIBRARY_PATH ENV LIBRARY_PATH

@ -60,6 +60,7 @@
# (To distribute this file outside of CMake, substitute the full # (To distribute this file outside of CMake, substitute the full
# License text for the above reference.) # License text for the above reference.)
include(LibFindMacros)
if (CMAKE_SIZEOF_VOID_P EQUAL 8) if (CMAKE_SIZEOF_VOID_P EQUAL 8)
set(_sdl_lib_suffix lib/x64) set(_sdl_lib_suffix lib/x64)

@ -91,9 +91,11 @@ add_component_dir (misc
gcd constants utf8stream stringops resourcehelpers rng messageformatparser weakcache gcd constants utf8stream stringops resourcehelpers rng messageformatparser weakcache
) )
add_component_dir (debug if (BUILD_OPENMW OR BUILD_OPENCS)
debugging debuglog add_component_dir(debug
) debugging debuglog
)
endif ()
IF(NOT WIN32 AND NOT APPLE) IF(NOT WIN32 AND NOT APPLE)
add_definitions(-DGLOBAL_DATA_PATH="${GLOBAL_DATA_PATH}") add_definitions(-DGLOBAL_DATA_PATH="${GLOBAL_DATA_PATH}")
@ -217,28 +219,32 @@ add_component_dir (fallback
) )
if(NOT WIN32 AND NOT ANDROID) if(NOT WIN32 AND NOT ANDROID)
add_component_dir (crashcatcher if (BUILD_OPENMW OR BUILD_OPENCS)
crashcatcher add_component_dir (crashcatcher
) crashcatcher
)
endif()
endif() endif()
add_component_dir(detournavigator add_component_dir(settings)
debug
makenavmesh if (BUILD_OPENMW OR BUILD_OPENCS)
findsmoothpath add_component_dir(detournavigator
recastmeshbuilder makenavmesh
recastmeshmanager findsmoothpath
cachedrecastmeshmanager recastmeshbuilder
navmeshmanager recastmeshmanager
navigatorimpl cachedrecastmeshmanager
asyncnavmeshupdater navmeshmanager
chunkytrimesh navigatorimpl
recastmesh asyncnavmeshupdater
tilecachedrecastmeshmanager chunkytrimesh
recastmeshobject recastmesh
navmeshtilescache tilecachedrecastmeshmanager
settings recastmeshobject
) navmeshtilescache
)
endif()
set (ESM_UI ${CMAKE_SOURCE_DIR}/files/ui/contentselector.ui set (ESM_UI ${CMAKE_SOURCE_DIR}/files/ui/contentselector.ui
) )
@ -303,11 +309,15 @@ target_link_libraries(components
${OPENGL_gl_LIBRARY} ${OPENGL_gl_LIBRARY}
${MyGUI_LIBRARIES} ${MyGUI_LIBRARIES}
${BSAOPTHASH_LIBRARIES} ${BSAOPTHASH_LIBRARIES}
RecastNavigation::DebugUtils
RecastNavigation::Detour
RecastNavigation::Recast
) )
if (BUILD_OPENMW OR BUILD_OPENCS)
target_link_libraries(components
RecastNavigation::DebugUtils
RecastNavigation::Detour
RecastNavigation::Recast)
endif ()
if (WIN32) if (WIN32)
target_link_libraries(components target_link_libraries(components
${Boost_LOCALE_LIBRARY} ${Boost_LOCALE_LIBRARY}

Loading…
Cancel
Save