mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-29 16:06:44 +00:00
Code Issues Releases Wiki Activity

cmake versioning

Browse source
This commit is contained in:
Mads Buvik Sandvei 2020-07-22 14:13:15 +02:00
parent cdb8505f1d
commit 40e9b970b9
3 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -21,7 +21,7 @@ else()
endif() endif()
# set the minimum required version across the board # set the minimum required version across the board
cmake_minimum_required(VERSION 3.14) cmake_minimum_required(VERSION 3.1.0)
project(OpenMW) project(OpenMW)

11
apps/openmw/CMakeLists.txt
View file

@ -207,7 +207,6 @@ if (MSVC)
endif (MSVC) endif (MSVC)
if(BUILD_OPENMW) if(BUILD_OPENMW)
if (NOT ANDROID) if (NOT ANDROID)
openmw_add_executable(openmw openmw_add_executable(openmw
${OPENMW_FILES} ${OPENMW_FILES}
@ -236,12 +235,17 @@ if(BUILD_OPENMW)
endif() endif()
if(BUILD_OPENMW_VR) if(BUILD_OPENMW_VR)
# Use of FetchContent to include the OpenXR SDK requires CMake 3.11
if(${CMAKE_VERSION} VERSION_LESS "3.11")
message(FATAL_ERROR "Building openmw_vr requires CMake version 3.11 or later.")
endif()
# TODO: Openmw and openmw_vr should preferrably share game code as a static or shared library # TODO: Openmw and openmw_vr should preferrably share game code as a static or shared library
# instead of being compiled separately, though for now that's not possible as i depend on # instead of being compiled separately, though for now that's not possible as i depend on
# USE_OPENXR preprocessor switches. # USE_OPENXR preprocessor switches.
set(OPENMW_VR_FILES set(OPENMW_VR_FILES
vrengine.cpp vrengine.cpp
) )
add_openmw_dir (mwvr add_openmw_dir (mwvr
openxraction openxrinput openxrmanager openxrmanagerimpl openxrswapchain openxrswapchainimpl openxraction openxrinput openxrmanager openxrmanagerimpl openxrswapchain openxrswapchainimpl
realisticcombat realisticcombat
@ -263,7 +267,10 @@ if(BUILD_OPENMW_VR)
GIT_TAG release-1.0.9 GIT_TAG release-1.0.9
) )
FetchContent_MakeAvailable(OpenXR) FetchContent_MakeAvailable(OpenXR)
target_link_libraries(openmw_vr openxr_loader) target_link_libraries(openmw_vr openxr_loader)
# openxr makes include directories private
# Delete this line when the issue is solved: https://github.com/KhronosGroup/OpenXR-SDK-Source/issues/195
target_include_directories(openmw_vr PRIVATE ${openxr_SOURCE_DIR}/include) target_include_directories(openmw_vr PRIVATE ${openxr_SOURCE_DIR}/include)
# Preprocessor variable used to control code paths to vr code # Preprocessor variable used to control code paths to vr code

12
cmake/OpenMWMacros.cmake
View file

@ -205,3 +205,15 @@ macro (copy_all_resource_files source_dir destination_dir_base destination_dir_r
copy_resource_file("${source_dir}/${f}" "${destination_dir_base}" "${destination_dir_relative}/${filename}") copy_resource_file("${source_dir}/${f}" "${destination_dir_base}" "${destination_dir_relative}/${filename}")
endforeach (f) endforeach (f)
endmacro (copy_all_resource_files) endmacro (copy_all_resource_files)
if(NOT ${CMAKE_VERSION} VERSION_LESS 3.11)
if(${CMAKE_VERSION} VERSION_LESS 3.14)
macro(FetchContent_MakeAvailable NAME)
FetchContent_GetProperties(${NAME})
if(NOT ${NAME}_POPULATED)
FetchContent_Populate(${NAME})
add_subdirectory(${${NAME}_SOURCE_DIR} ${${NAME}_BINARY_DIR})
endif()
endmacro()
endif()
endif()