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

Install macOS binaries in to bundle

This commit is contained in:
Andrew Nelless 2017-03-07 14:10:24 +00:00
parent 8d8d4d600e
commit 20948522ea
5 changed files with 18 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -371,17 +371,19 @@ macro(configure_files srcDir destDir)
message (STATUS "Configuring file ${templateFile}") message (STATUS "Configuring file ${templateFile}")
configure_file (${sourceTemplateFilePath} ${destDir}/${templateFile} @ONLY) configure_file (${sourceTemplateFilePath} ${destDir}/${templateFile} @ONLY)
endforeach (templateFile) endforeach (templateFile)
endmacro (configure_files) endmacro (configure_files)
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
configure_files (${CMAKE_CURRENT_SOURCE_DIR}/dist/macos/bundle ${CMAKE_BINARY_DIR}/bundle) set (SYNERGY_BUNDLE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/dist/macos/bundle)
include (BundleUtilities) set (SYNERGY_BUNDLE_DIR ${CMAKE_BINARY_DIR}/bundle)
verify_app (${CMAKE_BINARY_DIR}/bundle/Synergy.app) set (SYNERGY_BUNDLE_APP_DIR ${SYNERGY_BUNDLE_DIR}/Synergy.app)
set (SYNERGY_BUNDLE_BINARY_DIR ${SYNERGY_BUNDLE_APP_DIR}/Contents/MacOS)
configure_files (${SYNERGY_BUNDLE_SOURCE_DIR} ${SYNERGY_BUNDLE_DIR})
elseif(WIN32 AND NOT UNIX) elseif(WIN32 AND NOT UNIX)
configure_files (${CMAKE_CURRENT_SOURCE_DIR}/dist/wix ${CMAKE_BINARY_DIR}/installer) configure_files (${CMAKE_CURRENT_SOURCE_DIR}/dist/wix ${CMAKE_BINARY_DIR}/installer)
endif() endif()
option(SYNERGY_BUILD_LEGACY_SERVICE "Build the legacy service (synergyd)" ON) option(SYNERGY_BUILD_LEGACY_SERVICE "Build the legacy service (synergyd)" ON)
add_subdirectory(src) add_subdirectory(src)

10
src/cmd/synergyc/CMakeLists.txt
View File

@ -60,12 +60,6 @@ add_executable(synergyc ${sources})
target_link_libraries(synergyc target_link_libraries(synergyc
arch base client common io mt net ipc platform server synlib ${libs} ${OPENSSL_LIBS}) arch base client common io mt net ipc platform server synlib ${libs} ${OPENSSL_LIBS})
if (WIN32) if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
else () install (TARGETS synergyc DESTINATION ${SYNERGY_BUNDLE_BINARY_DIR})
if (CONF_CPACK)
install(TARGETS
synergyc
COMPONENT core
DESTINATION bin)
endif()
endif() endif()

11
src/cmd/synergys/CMakeLists.txt
View File

@ -60,12 +60,7 @@ add_executable(synergys ${sources})
target_link_libraries(synergys target_link_libraries(synergys
arch base client common io mt net ipc platform server synlib ${libs} ${OPENSSL_LIBS}) arch base client common io mt net ipc platform server synlib ${libs} ${OPENSSL_LIBS})
if (WIN32) if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
else () install (TARGETS synergys DESTINATION ${SYNERGY_BUNDLE_BINARY_DIR})
if (CONF_CPACK)
install(TARGETS
synergys
COMPONENT core
DESTINATION bin)
endif()
endif() endif()

10
src/cmd/syntool/CMakeLists.txt
View File

@ -31,12 +31,6 @@ add_executable(syntool ${sources})
target_link_libraries(syntool target_link_libraries(syntool
synlib arch base client common io ipc mt net platform server ${libs} ${OPENSSL_LIBS}) synlib arch base client common io ipc mt net platform server ${libs} ${OPENSSL_LIBS})
if (WIN32) if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
else () install (TARGETS syntool DESTINATION ${SYNERGY_BUNDLE_BINARY_DIR})
if (CONF_CPACK)
install(TARGETS
syntool
COMPONENT core
DESTINATION bin)
endif()
endif() endif()

4
src/gui/CMakeLists.txt
View File

@ -38,3 +38,7 @@ if (WIN32)
target_link_libraries (synergy ${DNSSD_LIB}) target_link_libraries (synergy ${DNSSD_LIB})
set_target_properties (synergy PROPERTIES LINK_FLAGS "/NODEFAULTLIB:LIBCMT") set_target_properties (synergy PROPERTIES LINK_FLAGS "/NODEFAULTLIB:LIBCMT")
endif() endif()
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
install (TARGETS synergy DESTINATION ${SYNERGY_BUNDLE_BINARY_DIR})
endif()