adrido
/
MinetestMapperGUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use different bin dir on linux

master
Unknown 2019-03-24 05:44:02 +01:00
parent 2732263c2a
commit 328eef4673
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
CMakeLists.txt
View File

@ -65,8 +65,6 @@ set(TRANSLATIONS
translations/gui_en.ts translations/gui_en.ts
) )
include(getGitVersion)
if(${git_commits_since_last_tag} EQUAL 0) if(${git_commits_since_last_tag} EQUAL 0)
set (PRERELEASE 0) set (PRERELEASE 0)
else() else()
@ -132,13 +130,19 @@ endif()
# Installation # Installation
############################################################################### ###############################################################################
set(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION ".") set(INSTALL_RUNTIME_DIR "bin")
if(WIN32)
set(INSTALL_RUNTIME_DIR ".")
endif()
set(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION ${INSTALL_RUNTIME_DIR})
include(InstallRequiredSystemLibraries) include(InstallRequiredSystemLibraries)
#set(CPACK_PACKAGE_EXECUTABLES MinetestMapperGUI "Minetest Mapper GUI") #set(CPACK_PACKAGE_EXECUTABLES MinetestMapperGUI "Minetest Mapper GUI")
install(TARGETS MinetestMapperGUI install(TARGETS MinetestMapperGUI
RUNTIME DESTINATION . RUNTIME DESTINATION ${INSTALL_RUNTIME_DIR}
LIBRARY DESTINATION lib LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib ARCHIVE DESTINATION lib
) )
@ -155,19 +159,19 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/translations/
if(WIN32) if(WIN32)
#copy required dlls to install dir #copy required dlls to install dir
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Release/ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Release/
DESTINATION . DESTINATION ${INSTALL_RUNTIME_DIR}
CONFIGURATIONS Release CONFIGURATIONS Release
FILES_MATCHING PATTERN "*.dll") FILES_MATCHING PATTERN "*.dll")
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Debug/ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Debug/
DESTINATION . DESTINATION ${INSTALL_RUNTIME_DIR}
CONFIGURATIONS Debug CONFIGURATIONS Debug
FILES_MATCHING PATTERN "*.dll") FILES_MATCHING PATTERN "*.dll")
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/
DESTINATION . DESTINATION ${INSTALL_RUNTIME_DIR}
CONFIGURATIONS RelWithDebInfo CONFIGURATIONS RelWithDebInfo
FILES_MATCHING PATTERN "*.dll") FILES_MATCHING PATTERN "*.dll")
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/MinSizeRel/ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/MinSizeRel/
DESTINATION . DESTINATION ${INSTALL_RUNTIME_DIR}
CONFIGURATIONS RelWithDebInfo CONFIGURATIONS RelWithDebInfo
FILES_MATCHING PATTERN "*.dll") FILES_MATCHING PATTERN "*.dll")
elseif(UNIX) elseif(UNIX)