Username404-59/Yerbacon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Also use PROJECT_NAME for the installation directory."

Browse Source 
This reverts commit bf6974df
This commit is contained in:
Username404 2021-03-13 19:05:31 +01:00
parent d24c250dec
commit fab672afc7
Signed by: Username404-59
GPG Key ID: 7AB361FBB257A5D1
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -100,9 +100,6 @@ if (UNIX AND NOT MINGW)
DESTINATION yerbacon/${CMAKE_INSTALL_BINDIR}) DESTINATION yerbacon/${CMAKE_INSTALL_BINDIR})
endif() endif()
elseif(MINGW OR MSVC) 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(CMAKE_EXE_LINKER_FLAGS "-static -static-libstdc++ ${CMAKE_EXE_LINKER_FLAGS}")
set(CPACK_PACKAGE_FILE_NAME "${PNAME}_wpkg") set(CPACK_PACKAGE_FILE_NAME "${PNAME}_wpkg")
set(CPACK_NSIS_MUI_ICON "${CMAKE_CURRENT_SOURCE_DIR}/resources/${PROJECT_NAME}.ico") 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_MODIFY_PATH ON)
set(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON) set(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON)
set(CPACK_GENERATOR ZIP;NSIS) set(CPACK_GENERATOR ZIP;NSIS)
set(CMAKE_INSTALL_PREFIX "C:\\progs\\")
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ybcon.exe DESTINATION bin) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ybcon.exe DESTINATION bin)
endif() endif()
include(CPack) include(CPack)