mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
Move OSX code to OSX IF
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
This commit is contained in:
parent
2637b5c3f1
commit
957f5532b8
1 changed files with 8 additions and 27 deletions
|
@ -62,16 +62,7 @@ include_directories(.
|
||||||
subsurface-core/
|
subsurface-core/
|
||||||
)
|
)
|
||||||
|
|
||||||
# get the version string -- this is only used for Mac Bundle at this point
|
message(STATUS "Creating build files for Subsurface")
|
||||||
# the other version data gets updated when running make - this is set when running cmake
|
|
||||||
execute_process(
|
|
||||||
COMMAND sh scripts/get-version linux
|
|
||||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
|
||||||
OUTPUT_VARIABLE SSRF_VERSION_STRING
|
|
||||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
|
||||||
)
|
|
||||||
|
|
||||||
message(STATUS "Creating build files for Subsurface ${SSRF_VERSION_STRING}")
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# TODO: This Compilation part should go on the Target specific CMake.
|
# TODO: This Compilation part should go on the Target specific CMake.
|
||||||
|
@ -164,23 +155,13 @@ if(ANDROID)
|
||||||
set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} -llog)
|
set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} -llog)
|
||||||
endif()
|
endif()
|
||||||
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
|
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
|
||||||
if(SUBSURFACE_MOBILE)
|
execute_process(
|
||||||
set(SUBSURFACE_TARGET Subsurface-mobile)
|
COMMAND sh scripts/get-version linux
|
||||||
set(MACOSX_BUNDLE_INFO_STRING "Subsurface-mobile")
|
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
||||||
set(MACOSX_BUNDLE_ICON_FILE Subsurface.icns)
|
OUTPUT_VARIABLE SSRF_VERSION_STRING
|
||||||
set(MACOSX_BUNDLE_GUI_IDENTIFIER "org.subsurface-divelog")
|
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||||
set(MACOSX_BUNDLE_BUNDLE_NAME "Subsurface-mobile")
|
)
|
||||||
else()
|
set(SUBSURFACE_TARGET Subsurface)
|
||||||
set(SUBSURFACE_TARGET Subsurface)
|
|
||||||
set(MACOSX_BUNDLE_INFO_STRING "Subsurface")
|
|
||||||
set(MACOSX_BUNDLE_ICON_FILE Subsurface.icns)
|
|
||||||
set(MACOSX_BUNDLE_GUI_IDENTIFIER "org.subsurface-divelog")
|
|
||||||
set(MACOSX_BUNDLE_BUNDLE_NAME "Subsurface")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# on the Mac with Homebrew, libzip ends up with odd include dirs
|
|
||||||
include_directories(${LIBZIP_INCLUDE_DIRS})
|
|
||||||
|
|
||||||
find_library(APP_SERVICES_LIBRARY ApplicationServices)
|
find_library(APP_SERVICES_LIBRARY ApplicationServices)
|
||||||
find_library(HID_LIB HidApi)
|
find_library(HID_LIB HidApi)
|
||||||
set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} ${HID_LIB})
|
set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} ${HID_LIB})
|
||||||
|
|
Loading…
Add table
Reference in a new issue