mac error for cpack. removed mac if

This commit is contained in:
Nick Bolton 2011-04-28 12:11:53 +00:00
parent b5fa1a086e
commit bb0f84cba6
1 changed files with 13 additions and 7 deletions

View File

@ -39,8 +39,18 @@ endif()
project(synergy C CXX) project(synergy C CXX)
# put binaries in a different dir to make them easier to find. # put binaries in a different dir to make them easier to find.
if (WIN32)
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin) set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib) set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)
elseif (UNIX)
if (CMAKE_BUILD_TYPE STREQUAL Debug)
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin/debug)
set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib/debug)
elseif (CMAKE_BUILD_TYPE STREQUAL Release)
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin/release)
set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib/release)
endif()
endif()
# Set some easy to type variables. # Set some easy to type variables.
set(root_dir ${CMAKE_SOURCE_DIR}) set(root_dir ${CMAKE_SOURCE_DIR})
@ -289,7 +299,7 @@ if (CONF_CPACK)
if (UNIX) if (UNIX)
if (APPLE) if (APPLE)
# no cpack support for apple message(FATAL_ERROR "CPack support for Apple has been removed.")
else () else ()
install(FILES bin/qsynergy install(FILES bin/qsynergy
DESTINATION bin DESTINATION bin
@ -318,10 +328,6 @@ if (CONF_CPACK)
set(CPACK_SOURCE_GENERATOR ZIP) set(CPACK_SOURCE_GENERATOR ZIP)
endif() endif()
if (APPLE)
set(CPACK_SYSTEM_NAME "MacOSX-Universal")
endif()
set(CPACK_PACKAGE_NAME "synergy") set(CPACK_PACKAGE_NAME "synergy")
set(CPACK_PACKAGE_VENDOR "The Synergy Project") set(CPACK_PACKAGE_VENDOR "The Synergy Project")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Synergy server and client") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Synergy server and client")