mirror
/
openmw
mirror of https://github.com/OpenMW/openmw.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'tidy-windows-installer' into 'master'

Browse Source 
Tidy Windows installation directory

See merge request OpenMW/openmw!4484
master
psi29a 1 week ago
parent 356c530d8c 6efef81635
commit 7afbf81e6a
1 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File

34
CMakeLists.txt
Unescape Escape View File

@ -945,23 +945,43 @@ elseif(NOT APPLE)
if(WIN32) if(WIN32)
INSTALL(DIRECTORY "${INSTALL_SOURCE}/" DESTINATION "." FILES_MATCHING PATTERN "*.dll" INSTALL(DIRECTORY "${INSTALL_SOURCE}/" DESTINATION "." FILES_MATCHING PATTERN "*.dll"
PATTERN "deps" EXCLUDE PATTERN ".cmake" EXCLUDE
PATTERN ".qt" EXCLUDE
PATTERN "_CPack_Packages" EXCLUDE
PATTERN "_deps" EXCLUDE
PATTERN "apps" EXCLUDE PATTERN "apps" EXCLUDE
PATTERN "bin" EXCLUDE
PATTERN "CMakeFiles" EXCLUDE PATTERN "CMakeFiles" EXCLUDE
PATTERN "components" EXCLUDE PATTERN "components" EXCLUDE
PATTERN "deps" EXCLUDE
PATTERN "docs" EXCLUDE PATTERN "docs" EXCLUDE
PATTERN "extern" EXCLUDE PATTERN "extern" EXCLUDE
PATTERN "files" EXCLUDE PATTERN "files" EXCLUDE
PATTERN "Testing" EXCLUDE) PATTERN "lib" EXCLUDE
PATTERN "SymStore" EXCLUDE
PATTERN "symstore-venv" EXCLUDE
PATTERN "Testing" EXCLUDE
PATTERN "tests_output" EXCLUDE
PATTERN "try-compile")
INSTALL(DIRECTORY "${INSTALL_SOURCE}/" DESTINATION "." CONFIGURATIONS Debug;RelWithDebInfo FILES_MATCHING PATTERN "*.pdb" INSTALL(DIRECTORY "${INSTALL_SOURCE}/" DESTINATION "." CONFIGURATIONS Debug;RelWithDebInfo FILES_MATCHING PATTERN "*.pdb"
PATTERN "deps" EXCLUDE PATTERN ".cmake" EXCLUDE
PATTERN ".qt" EXCLUDE
PATTERN "_CPack_Packages" EXCLUDE
PATTERN "_deps" EXCLUDE
PATTERN "apps" EXCLUDE PATTERN "apps" EXCLUDE
PATTERN "bin" EXCLUDE
PATTERN "CMakeFiles" EXCLUDE PATTERN "CMakeFiles" EXCLUDE
PATTERN "components" EXCLUDE PATTERN "components" EXCLUDE
PATTERN "deps" EXCLUDE
PATTERN "docs" EXCLUDE PATTERN "docs" EXCLUDE
PATTERN "extern" EXCLUDE PATTERN "extern" EXCLUDE
PATTERN "files" EXCLUDE PATTERN "files" EXCLUDE
PATTERN "Testing" EXCLUDE) PATTERN "lib" EXCLUDE
PATTERN "SymStore" EXCLUDE
PATTERN "symstore-venv" EXCLUDE
PATTERN "Testing" EXCLUDE
PATTERN "tests_output" EXCLUDE
PATTERN "try-compile")
INSTALL(FILES "${INSTALL_SOURCE}/openmw.cfg.install" DESTINATION "." RENAME "openmw.cfg") INSTALL(FILES "${INSTALL_SOURCE}/openmw.cfg.install" DESTINATION "." RENAME "openmw.cfg")
INSTALL(FILES "${OpenMW_SOURCE_DIR}/CHANGELOG.md" DESTINATION "." RENAME "CHANGELOG.txt") INSTALL(FILES "${OpenMW_SOURCE_DIR}/CHANGELOG.md" DESTINATION "." RENAME "CHANGELOG.txt")
INSTALL(FILES "${OpenMW_SOURCE_DIR}/README.md" DESTINATION "." RENAME "README.txt") INSTALL(FILES "${OpenMW_SOURCE_DIR}/README.md" DESTINATION "." RENAME "README.txt")
@ -1009,7 +1029,11 @@ elseif(NOT APPLE)
SET(VCREDIST64 "${OpenMW_BINARY_DIR}/vcredist_x64.exe" CACHE FILEPATH "Path to vcredist_x64.exe") SET(VCREDIST64 "${OpenMW_BINARY_DIR}/vcredist_x64.exe" CACHE FILEPATH "Path to vcredist_x64.exe")
if(EXISTS ${VCREDIST64}) if(EXISTS ${VCREDIST64})
INSTALL(FILES ${VCREDIST64} DESTINATION "redist") INSTALL(FILES ${VCREDIST64} DESTINATION "redist")
SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "ExecWait '\\\"$INSTDIR\\\\redist\\\\vcredist_x64.exe\\\" /q /norestart'" ) get_filename_component(REDIST_FILENAME "${VCREDIST64}" NAME)
SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "
ExecWait '\\\"$INSTDIR\\\\redist\\\\${REDIST_FILENAME}\\\" /q /norestart'
RMDir /r \\\"$INSTDIR\\\\redist\\\"
")
endif(EXISTS ${VCREDIST64}) endif(EXISTS ${VCREDIST64})
if(CMAKE_CL_64) if(CMAKE_CL_64)

Write Preview
Loading…
Cancel
Save