diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2022-02-06 16:04:57 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2022-02-06 16:04:57 +0100 |
| commit | 59dccf358523dfc7679d1d8c120452a71e42243c (patch) | |
| tree | f0f3cc006e8157d6bd699bd644b7dd7b35387ac2 /distribution/win32 | |
| parent | fd6639655b399a79fb72f494786a4f57da9c90e7 (diff) | |
| parent | d0ca838c7ab297036b4a7c45351761a48fe05efd (diff) | |
Merge branch 'feature/upstrem' into develop
Diffstat (limited to 'distribution/win32')
| -rw-r--r-- | distribution/win32/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | distribution/win32/nsis/CMakeLists.txt | 29 |
2 files changed, 18 insertions, 16 deletions
diff --git a/distribution/win32/CMakeLists.txt b/distribution/win32/CMakeLists.txt index 80ecfe3..3a46c7f 100644 --- a/distribution/win32/CMakeLists.txt +++ b/distribution/win32/CMakeLists.txt @@ -1,4 +1,3 @@ -SET(CPACK_SOURCE_GENERATOR "ZIP") - -ADD_SUBDIRECTORY(nsis) +set(CPACK_SOURCE_GENERATOR "ZIP") +add_subdirectory(nsis) diff --git a/distribution/win32/nsis/CMakeLists.txt b/distribution/win32/nsis/CMakeLists.txt index 150fe43..ef1775c 100644 --- a/distribution/win32/nsis/CMakeLists.txt +++ b/distribution/win32/nsis/CMakeLists.txt @@ -1,23 +1,26 @@ -STRING(REPLACE "/" "\\\\" NATIVE_CURRENT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REPLACE "/" "\\\\" NATIVE_CURRENT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) -SET(CPACK_GENERATOR "NSIS") -SET(CPACK_PACKAGE_INSTALL_DIRECTORY "XTrackCAD") -SET(CPACK_NSIS_EXECUTABLE_NAME "bin\\\\xtrkcad.exe") -SET(CPACK_NSIS_DISPLAY_NAME "XTrackCAD ${CPACK_PACKAGE_VERSION}") -SET(CPACK_PACKAGE_ICON "${NATIVE_CURRENT_SOURCE_DIR}\\\\headerimage.bmp") -SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\xtrkcad.exe") -SET(CPACK_NSIS_HELP_LINK "http://www.xtrkcad.org") -SET(CPACK_NSIS_MUI_FINISHPAGE_RUN "xtrkcad.exe") +set(CPACK_GENERATOR "NSIS") +set(CPACK_PACKAGE_INSTALL_DIRECTORY "XTrackCAD") +set(CPACK_NSIS_EXECUTABLE_NAME "bin\\\\xtrkcad.exe") +set(CPACK_NSIS_DISPLAY_NAME "XTrackCAD ${CPACK_PACKAGE_VERSION}") +set(CPACK_PACKAGE_ICON "${NATIVE_CURRENT_SOURCE_DIR}\\\\headerimage.bmp") +set(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\xtrkcad.exe") +set(CPACK_NSIS_HELP_LINK "http://www.xtrkcad.org") +set(CPACK_NSIS_MUI_FINISHPAGE_RUN "xtrkcad.exe") set(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL "on") +set(CMAKE_INSTALL_OPENMP_LIBRARIES TRUE) -SET(CPACK_NSIS_STARTMENU_FOLDER "XTrackCAD") +set(CPACK_NSIS_STARTMENU_FOLDER "XTrackCAD") -SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS +set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "; add part specific to XTrackCAD installation !include \\\"${NATIVE_CURRENT_SOURCE_DIR}\\\\install.nsh\\\"") -SET(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS +set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "; add part specific to XTrackCAD uninstall !include \\\"${NATIVE_CURRENT_SOURCE_DIR}\\\\uninstall.nsh\\\"") -INCLUDE(CPack) +include (InstallRequiredSystemLibraries) + +include(CPack) |