rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Cleanup CMakeLists

This commit is contained in:
Andrew Nelless 2017-04-27 14:03:20 +01:00
parent 53d702a7c1
commit d7e1b79733
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
CMakeLists.txt
View File

@ -356,17 +356,11 @@ macro (configure_files srcDir destDir)
endforeach (templateFile) endforeach (templateFile)
endmacro (configure_files) endmacro (configure_files)
message (STATUS "SYNERGY_BUILD_LEGACY_INSTALLER = " ${SYNERGY_BUILD_LEGACY_INSTALLER})
if (${SYNERGY_BUILD_LEGACY_INSTALLER})
message (STATUS "Configuring the v1 installer")
# #
# macOS app Bundle # macOS app Bundle
# #
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set (CMAKE_INSTALL_RPATH "@loader_path/../Libraries;@loader_path/../Frameworks") set (CMAKE_INSTALL_RPATH "@loader_path/../Libraries;@loader_path/../Frameworks")
set (SYNERGY_BUNDLE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/dist/macos/bundle) set (SYNERGY_BUNDLE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/dist/macos/bundle)
set (SYNERGY_BUNDLE_DIR ${CMAKE_BINARY_DIR}/bundle) set (SYNERGY_BUNDLE_DIR ${CMAKE_BINARY_DIR}/bundle)
set (SYNERGY_BUNDLE_APP_DIR ${SYNERGY_BUNDLE_DIR}/Synergy.app) set (SYNERGY_BUNDLE_APP_DIR ${SYNERGY_BUNDLE_DIR}/Synergy.app)
@ -379,23 +373,25 @@ endif()
# Windows installer # Windows installer
# #
if (${CMAKE_SYSTEM_NAME} MATCHES "Windows") if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
configure_files (${CMAKE_CURRENT_SOURCE_DIR}/dist/wix ${CMAKE_BINARY_DIR}/installer) if (${SYNERGY_BUILD_LEGACY_INSTALLER})
endif() message (STATUS "Configuring the v1 installer")
configure_files (${CMAKE_CURRENT_SOURCE_DIR}/dist/wix ${CMAKE_BINARY_DIR}/installer)
else() else()
message (STATUS "NOT configuring the v1 installer") message (STATUS "NOT configuring the v1 installer")
endif()
endif() endif()
#
# Linux installation
#
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
configure_files (${CMAKE_CURRENT_SOURCE_DIR}/dist/rpm ${CMAKE_BINARY_DIR}/rpm) configure_files (${CMAKE_CURRENT_SOURCE_DIR}/dist/rpm ${CMAKE_BINARY_DIR}/rpm)
install(FILES res/synergy.svg DESTINATION share/icons)
if("${VERSION_MAJOR}" STREQUAL "2") if("${VERSION_MAJOR}" STREQUAL "2")
install(FILES res/synergy2.desktop DESTINATION share/applications) install(FILES res/synergy2.desktop DESTINATION share/applications)
else() else()
install(FILES res/synergy.desktop DESTINATION share/applications) install(FILES res/synergy.desktop DESTINATION share/applications)
endif() endif()
install(FILES res/synergy.svg DESTINATION share/icons)
endif() endif()
add_subdirectory (src) add_subdirectory (src)