Skip to content

Commit d3b509d

Browse files
committed
Merge branch 'only-local-openmw.cfg-on-windows' into 'master'
Install the local openmw.cfg template on Windows See merge request OpenMW/openmw!4404
2 parents 891bb67 + 06bf80c commit d3b509d

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

CMakeLists.txt

+9-4
Original file line numberDiff line numberDiff line change
@@ -542,14 +542,19 @@ pack_resource_file(${OpenMW_SOURCE_DIR}/files/settings-default.cfg
542542
configure_resource_file(${OpenMW_SOURCE_DIR}/files/openmw.appdata.xml
543543
"${OpenMW_BINARY_DIR}" "openmw.appdata.xml")
544544

545-
if (NOT APPLE)
545+
if (APPLE)
546+
configure_file(${OpenMW_SOURCE_DIR}/files/openmw.cfg
547+
"${OpenMW_BINARY_DIR}/openmw.cfg")
548+
elseif (WIN32)
546549
configure_resource_file(${OpenMW_SOURCE_DIR}/files/openmw.cfg.local
547550
"${OpenMW_BINARY_DIR}" "openmw.cfg")
548-
configure_resource_file(${OpenMW_SOURCE_DIR}/files/openmw.cfg
551+
configure_resource_file(${OpenMW_SOURCE_DIR}/files/openmw.cfg.local
549552
"${OpenMW_BINARY_DIR}" "openmw.cfg.install")
550553
else ()
551-
configure_file(${OpenMW_SOURCE_DIR}/files/openmw.cfg
552-
"${OpenMW_BINARY_DIR}/openmw.cfg")
554+
configure_resource_file(${OpenMW_SOURCE_DIR}/files/openmw.cfg.local
555+
"${OpenMW_BINARY_DIR}" "openmw.cfg")
556+
configure_resource_file(${OpenMW_SOURCE_DIR}/files/openmw.cfg
557+
"${OpenMW_BINARY_DIR}" "openmw.cfg.install")
553558
endif ()
554559

555560
pack_resource_file(${OpenMW_SOURCE_DIR}/files/openmw-cs.cfg

0 commit comments

Comments
 (0)