1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-15 14:26:35 +00:00

Reverts useless CmakeList formatting

This commit is contained in:
florent.teppe 2023-01-02 18:35:05 +01:00
parent 077cf97bc4
commit e9190bedc8

View file

@ -4,7 +4,6 @@ project(Components)
set (VERSION_IN_FILE "${OpenMW_SOURCE_DIR}/files/version.in")
set (VERSION_FILE_PATH_BASE "${OpenMW_BINARY_DIR}")
set (VERSION_FILE_PATH_RELATIVE resources/version)
if (GIT_CHECKOUT)
get_generator_is_multi_config(multi_config)
add_custom_target (git-version
@ -28,6 +27,7 @@ else(GIT_CHECKOUT)
endif (GIT_CHECKOUT)
# source files
add_component_dir (lua
luastate scriptscontainer utilpackage serialization configuration l10n storage
)
@ -191,9 +191,9 @@ add_component_dir(esm4
loadweap
loadwrld
reader
readerutils
reference
script
readerutils
)
add_component_dir (misc
@ -213,7 +213,6 @@ IF(NOT WIN32 AND NOT APPLE)
add_definitions(-DGLOBAL_DATA_PATH="${GLOBAL_DATA_PATH}")
add_definitions(-DGLOBAL_CONFIG_PATH="${GLOBAL_CONFIG_PATH}")
ENDIF()
add_component_dir (files
linuxpath androidpath windowspath macospath fixedpath multidircollection collections configurationmanager
constrainedfilestream memorystream hash configfileparser openfile constrainedfilestreambuf conversion
@ -274,6 +273,7 @@ add_component_dir(lua_ui
adapter text textedit window image container flex
)
if(WIN32)
add_component_dir (crashcatcher
windows_crashcatcher
@ -465,7 +465,6 @@ if(OSG_STATIC AND CMAKE_SYSTEM_NAME MATCHES "Linux")
find_package(X11 REQUIRED COMPONENTS Xinerama Xrandr)
target_link_libraries(components ${CMAKE_DL_LIBS} X11::X11 X11::Xinerama X11::Xrandr)
find_package(Fontconfig MODULE)
if(Fontconfig_FOUND)
target_link_libraries(components Fontconfig::Fontconfig)
endif()
@ -485,6 +484,7 @@ if(BUILD_WITH_CODE_COVERAGE)
target_link_libraries(components gcov)
endif()
# Make the variable accessible for other subdirectories
set(COMPONENT_FILES ${COMPONENT_FILES} PARENT_SCOPE)
@ -493,10 +493,8 @@ target_compile_definitions(components PUBLIC BT_USE_DOUBLE_PRECISION)
if(OSG_STATIC)
unset(_osg_plugins_static_files)
add_library(components_osg_plugins INTERFACE)
foreach(_plugin ${USED_OSG_PLUGINS})
string(TOUPPER ${_plugin} _plugin_uc)
if(OPENMW_USE_SYSTEM_OSG)
list(APPEND _osg_plugins_static_files ${${_plugin_uc}_LIBRARY})
else()
@ -505,7 +503,6 @@ if(OSG_STATIC)
add_dependencies(components_osg_plugins ${${_plugin_uc}_LIBRARY})
endif()
endforeach()
# We use --whole-archive because OSG plugins use registration.
get_whole_archive_options(_opts ${_osg_plugins_static_files})
target_link_options(components_osg_plugins INTERFACE ${_opts})