From 59f2fccc9f4f251af62dbaa731ce224e5aafb103 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 10 Mar 2023 01:08:49 +0100
Subject: [PATCH] Split openmw-cs into binary and library
---
apps/opencs/CMakeLists.txt | 28 +++++++++++++++++++---------
1 file changed, 19 insertions(+), 9 deletions(-)
diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index a55ba56330..2104d80750 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -1,4 +1,4 @@
-set (OPENCS_SRC main.cpp
+set (OPENCS_SRC
${CMAKE_SOURCE_DIR}/files/windows/opencs.rc
)
@@ -143,7 +143,7 @@ set (OPENCS_UI
${CMAKE_SOURCE_DIR}/files/ui/filedialog.ui
)
-source_group (openmw-cs FILES ${OPENCS_SRC} ${OPENCS_HDR})
+source_group (openmw-cs FILES main.cpp ${OPENCS_SRC} ${OPENCS_HDR})
if(WIN32)
set(QT_USE_QTMAIN TRUE)
@@ -167,18 +167,26 @@ else()
set (OPENCS_OPENMW_CFG "")
endif(APPLE)
-openmw_add_executable(openmw-cs
- MACOSX_BUNDLE
+add_library(openmw-cs-lib
${OPENCS_SRC}
${OPENCS_UI_HDR}
${OPENCS_MOC_SRC}
${OPENCS_RES_SRC}
+)
+
+set_target_properties(openmw-cs-lib PROPERTIES OUTPUT_NAME openmw-cs)
+
+openmw_add_executable(openmw-cs
+ MACOSX_BUNDLE
${OPENCS_MAC_ICON}
${OPENCS_CFG}
${OPENCS_DEFAULT_FILTERS_FILE}
${OPENCS_OPENMW_CFG}
+ main.cpp
)
+target_link_libraries(openmw-cs openmw-cs-lib)
+
if(APPLE)
set(OPENCS_BUNDLE_NAME "OpenMW-CS")
set(OPENCS_BUNDLE_RESOURCES_DIR "${OpenMW_BINARY_DIR}/${OPENCS_BUNDLE_NAME}.app/Contents/Resources")
@@ -212,7 +220,7 @@ if(APPLE)
COMMAND cp "${OpenMW_BINARY_DIR}/resources/version" "${OPENCS_BUNDLE_RESOURCES_DIR}/resources")
endif(APPLE)
-target_link_libraries(openmw-cs
+target_link_libraries(openmw-cs-lib
# CMake's built-in OSG finder does not use pkgconfig, so we have to
# manually ensure the order is correct for inter-library dependencies.
# This only makes a difference with `-DOPENMW_USE_SYSTEM_OSG=ON -DOSG_STATIC=ON`.
@@ -228,10 +236,10 @@ target_link_libraries(openmw-cs
components_qt
)
-target_link_libraries(openmw-cs Qt::Widgets Qt::Core Qt::Network Qt::OpenGL)
+target_link_libraries(openmw-cs-lib Qt::Widgets Qt::Core Qt::Network Qt::OpenGL)
if (WIN32)
- target_link_libraries(openmw-cs ${Boost_LOCALE_LIBRARY})
+ target_link_libraries(openmw-cs-lib ${Boost_LOCALE_LIBRARY})
INSTALL(TARGETS openmw-cs RUNTIME DESTINATION ".")
get_generator_is_multi_config(multi_config)
@@ -257,16 +265,18 @@ if(APPLE)
endif()
if(USE_QT)
- set_property(TARGET openmw-cs PROPERTY AUTOMOC ON)
+ set_property(TARGET openmw-cs-lib PROPERTY AUTOMOC ON)
endif(USE_QT)
if (BUILD_WITH_CODE_COVERAGE)
+ target_compile_options(openmw-cs-lib PRIVATE --coverage)
+ target_link_libraries(openmw-cs-lib gcov)
target_compile_options(openmw-cs PRIVATE --coverage)
target_link_libraries(openmw-cs gcov)
endif()
if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.16 AND MSVC)
- target_precompile_headers(openmw-cs PRIVATE
+ target_precompile_headers(openmw-cs-lib PRIVATE
<boost/filesystem.hpp>
<boost/program_options/options_description.hpp>