From fab672afc76a70a4479901976926b95d2a4a0766 Mon Sep 17 00:00:00 2001 From: Username404 Date: Sat, 13 Mar 2021 19:05:31 +0100 Subject: [PATCH] Revert "Also use PROJECT_NAME for the installation directory." This reverts commit bf6974df --- CMakeLists.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ad62765..36143cc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -100,9 +100,6 @@ if (UNIX AND NOT MINGW) DESTINATION yerbacon/${CMAKE_INSTALL_BINDIR}) endif() elseif(MINGW OR MSVC) - set(PREFIXDIR "progs\\${PROJECT_NAME}") - set(CMAKE_INSTALL_PREFIX "C:\\${PREFIXDIR}") - set(CPACK_PACKAGING_INSTALL_PREFIX "${PREFIXDIR}") set(CMAKE_EXE_LINKER_FLAGS "-static -static-libstdc++ ${CMAKE_EXE_LINKER_FLAGS}") set(CPACK_PACKAGE_FILE_NAME "${PNAME}_wpkg") set(CPACK_NSIS_MUI_ICON "${CMAKE_CURRENT_SOURCE_DIR}/resources/${PROJECT_NAME}.ico") @@ -113,6 +110,7 @@ elseif(MINGW OR MSVC) set(CPACK_NSIS_MODIFY_PATH ON) set(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON) set(CPACK_GENERATOR ZIP;NSIS) + set(CMAKE_INSTALL_PREFIX "C:\\progs\\") install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ybcon.exe DESTINATION bin) endif() include(CPack) \ No newline at end of file