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

Merge 1.3.6 r648:652 into trunk

This commit is contained in:
Nick Bolton 2010-06-21 06:38:38 +00:00
parent 84c66db56c
commit 8d0ec989d1
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmake/CMakeLists_config.txt
View File

@ -97,6 +97,18 @@ IF(UNIX)
IF(APPLE) IF(APPLE)
# build mac os x universal
set(CMAKE_OSX_ARCHITECTURES "ppc;i386"
CACHE STRING "Build architectures for OSX" FORCE)
# TODO: fix 64-bit failures
#set(CMAKE_OSX_ARCHITECTURES "ppc;i386;ppc64;x86_64"
# CACHE STRING "Build architectures for OSX" FORCE)
# not sure this is a good idea
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.5"
# CACHE STRING "Flags used by the compiler during all build types." FORCE)
FIND_LIBRARY(lib_ScreenSaver ScreenSaver) FIND_LIBRARY(lib_ScreenSaver ScreenSaver)
FIND_LIBRARY(lib_IOKit IOKit) FIND_LIBRARY(lib_IOKit IOKit)
FIND_LIBRARY(lib_ApplicationServices ApplicationServices) FIND_LIBRARY(lib_ApplicationServices ApplicationServices)

4
cmake/CMakeLists_cpack.txt
View File

@ -76,6 +76,10 @@ ELSE(UNIX)
SET(CPACK_SOURCE_GENERATOR ZIP) SET(CPACK_SOURCE_GENERATOR ZIP)
ENDIF(UNIX) ENDIF(UNIX)
if(APPLE)
set(CPACK_SYSTEM_NAME "MacOSX-Universal")
endif(APPLE)
SET(CPACK_PACKAGE_NAME "synergy-plus") SET(CPACK_PACKAGE_NAME "synergy-plus")
SET(CPACK_PACKAGE_VENDOR "The Synergy+ Project") SET(CPACK_PACKAGE_VENDOR "The Synergy+ Project")
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Installs Synergy+ server and client") SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Installs Synergy+ server and client")