mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-10-05 00:56:32 +00:00
Code Issues Releases Wiki Activity

[General] Stop requiring some libraries when building only the server

Browse source
This commit is contained in:
David Cernat 2021-07-25 21:40:19 +02:00
parent 6baee12bc4
commit e05ea03fb9
1 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
components/CMakeLists.txt
View file

@ -271,7 +271,10 @@ endif()
set (ESM_UI ${CMAKE_SOURCE_DIR}/files/ui/contentselector.ui set (ESM_UI ${CMAKE_SOURCE_DIR}/files/ui/contentselector.ui
) )
IF(BUILD_OPENMW OR BUILD_OPENCS) # Start of tes3mp change (major)
#
# Don't require Qt when building the server
if (BUILD_OPENMW OR BUILD_OPENCS)
if (USE_QT) if (USE_QT)
add_component_qt_dir (contentselector add_component_qt_dir (contentselector
model/modelitem model/esmfile model/modelitem model/esmfile
@ -296,7 +299,8 @@ if (USE_QT)
QT5_WRAP_UI(ESM_UI_HDR ${ESM_UI}) QT5_WRAP_UI(ESM_UI_HDR ${ESM_UI})
QT5_WRAP_CPP(MOC_SRCS ${COMPONENT_MOC_FILES}) QT5_WRAP_CPP(MOC_SRCS ${COMPONENT_MOC_FILES})
endif() endif()
ENDIF(BUILD_OPENMW OR BUILD_OPENCS) endif(BUILD_OPENMW OR BUILD_OPENCS)
# End of tes3mp change (major)
if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64" AND NOT APPLE) if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64" AND NOT APPLE)
@ -308,6 +312,10 @@ include_directories(${BULLET_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR})
add_library(components STATIC ${COMPONENT_FILES} ${MOC_SRCS} ${ESM_UI_HDR}) add_library(components STATIC ${COMPONENT_FILES} ${MOC_SRCS} ${ESM_UI_HDR})
# Start of tes3mp change (major)
#
# Don't require OSG when building the server
if (BUILD_OPENMW OR BUILD_OPENCS)
target_link_libraries(components target_link_libraries(components
# CMake's built-in OSG finder does not use pkgconfig, so we have to # CMake's built-in OSG finder does not use pkgconfig, so we have to
# manually ensure the order is correct for inter-library dependencies. # manually ensure the order is correct for inter-library dependencies.
@ -334,10 +342,12 @@ target_link_libraries(components
${MyGUI_LIBRARIES} ${MyGUI_LIBRARIES}
LZ4::LZ4 LZ4::LZ4
) )
endif()
# End of tes3mp change (major)
# Start of tes3mp change (major) # Start of tes3mp change (major)
# #
# Don't require RecastNavigation or Base64 when building the server # Don't require RecastNavigation, Base64 or Bullet when building the server
if (BUILD_OPENMW OR BUILD_OPENCS) if (BUILD_OPENMW OR BUILD_OPENCS)
target_link_libraries(components target_link_libraries(components
RecastNavigation::DebugUtils RecastNavigation::DebugUtils
@ -345,21 +355,26 @@ if (BUILD_OPENMW OR BUILD_OPENCS)
RecastNavigation::Recast RecastNavigation::Recast
Base64 Base64
${BULLET_LIBRARIES}
) )
endif () endif ()
# End of tes3mp change (major) # End of tes3mp change (major)
target_link_libraries(components ${BULLET_LIBRARIES})
if (WIN32) if (WIN32)
target_link_libraries(components target_link_libraries(components
${Boost_LOCALE_LIBRARY} ${Boost_LOCALE_LIBRARY}
${Boost_ZLIB_LIBRARY}) ${Boost_ZLIB_LIBRARY})
endif() endif()
# Start of tes3mp change (major)
#
# Don't require Qt when building the server
if (USE_QT) if (USE_QT)
if (BUILD_OPENMW OR BUILD_OPENCS
target_link_libraries(components Qt5::Widgets Qt5::Core) target_link_libraries(components Qt5::Widgets Qt5::Core)
endif() endif()
endif()
# End of tes3mp change (major)
if (GIT_CHECKOUT) if (GIT_CHECKOUT)
add_dependencies (components git-version) add_dependencies (components git-version)