diff options
| author |   Unit 193 <unit193@ubuntu.com> | 2019-07-18 01:31:43 -0400 |
|---|---|---|
| committer | Unit 193 <unit193@ubuntu.com> | 2019-07-18 01:31:43 -0400 |
| commit | a916009d4b29995ea8ad61ad47a51c2ee1fa80bc (patch) | |
| tree | f53f459caa6868bda7c3f6dae0d8f30f19325af3 /CMakeLists.txt | |
| parent | 68a36b3b67ec82cdd3f77e88e40d1043cbab5000 (diff) | |
New upstream version 2.3.0+dfsgupstream/2.3.0+dfsg
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f6f6aa7..d5ec96f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -311,8 +311,10 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Windows") ${OPENSSL_ROOT}/lib/ssleay32.lib ) elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - - if (IS_DIRECTORY /opt/local) + find_program(BREW_PROGRAM "brew") + find_program(PORT_PROGRAM "port") + + if (IS_DIRECTORY /opt/local AND PORT_PROGRAM) # macports set (OPENSSL_ROOT /opt/local) @@ -321,7 +323,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") ${OPENSSL_ROOT}/lib/libcrypto.a z ) - elseif (IS_DIRECTORY /usr/local/opt/openssl) + elseif (IS_DIRECTORY /usr/local/opt/openssl AND BREW_PROGRAM) # brew set (OPENSSL_ROOT /usr/local/opt/openssl) @@ -388,12 +390,20 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set (BARRIER_BUNDLE_BINARY_DIR ${BARRIER_BUNDLE_APP_DIR}/Contents/MacOS) configure_files (${BARRIER_BUNDLE_SOURCE_DIR} ${BARRIER_BUNDLE_DIR}) + + if (CMAKE_BUILD_TYPE STREQUAL "Release") + add_custom_target(Barrier_dmg ALL + bash build_installer.sh + DEPENDS barrier barriers barrierc + WORKING_DIRECTORY ${BARRIER_BUNDLE_DIR}) + endif() endif() # # Windows installer # if (${CMAKE_SYSTEM_NAME} MATCHES "Windows") + set (BARRIER_WIX_VERSION "${BARRIER_VERSION_MAJOR}.${BARRIER_VERSION_MINOR}.${BARRIER_VERSION_PATCH}") message (STATUS "Configuring the wix installer") configure_files (${CMAKE_CURRENT_SOURCE_DIR}/dist/wix ${CMAKE_BINARY_DIR}/installer-wix) message (STATUS "Configuring the inno installer") |