mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove checking the Platform and the App Type,

Browse source 
The check must be done, but not on the way I tried to do.

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
This commit is contained in:
Tomaz Canabrava 2015-12-16 14:33:52 -02:00 • committed by Dirk Hohndel
parent 85946700eb
commit 89658cc291
1 changed files with 47 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

96
CMakeLists.txt
View file

@ -119,57 +119,55 @@ include_directories(.
# Project Target specific configuration should go here, # Project Target specific configuration should go here,
# if the configuration is too big or would disrupt the normal code flux, # if the configuration is too big or would disrupt the normal code flux,
# move it somewhere else (another file) and include it. # move it somewhere else (another file) and include it.
if(SUBSURFACE_TARGET_PLATFORM MATCHES "Android") # if(SUBSURFACE_TARGET_PLATFORM MATCHES "Android")
set(FBSUPPORT OFF) # set(FBSUPPORT OFF)
set(NO_PRINTING ON) # set(NO_PRINTING ON)
list(APPEND QT_EXTRA_COMPONENTS AndroidExtras Quick) # list(APPEND QT_EXTRA_COMPONENTS AndroidExtras Quick)
list(APPEND QT_EXTRA_LIBRARIES Qt5::AndroidExtras Qt5::Quick) # list(APPEND QT_EXTRA_LIBRARIES Qt5::AndroidExtras Qt5::Quick)
set(SUBSURFACE_TARGET subsurface) # set(SUBSURFACE_TARGET subsurface)
set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} -llog) # set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} -llog)
add_definitions(-DSUBSURFACE_MOBILE) # add_definitions(-DSUBSURFACE_MOBILE)
elseif(SUBSURFACE_TARGET_PLATFORM MATCHES "AndroidEmulator") # elseif(SUBSURFACE_TARGET_PLATFORM MATCHES "AndroidEmulator")
elseif(SUBSURFACE_TARGET_PLATFORM MATCHES "iOS")
elseif(SUBSURFACE_TARGET_PLATFORM MATCHES "iOSEmulator") # set up the different target platforms
elseif(SUBSURFACE_TARGET_PLATFORM MATCHES "Desktop") if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
# set up the different target platforms set(SUBSURFACE_TARGET subsurface)
if(CMAKE_SYSTEM_NAME STREQUAL "Linux") # add pthread to the end of the library list on Linux
set(SUBSURFACE_TARGET subsurface) # this is only needed on Ubuntu
# add pthread to the end of the library list on Linux # but shouldn't hurt on other Linux versions
# this is only needed on Ubuntu # in some builds we appear to be missing libz for some strange reason...
# but shouldn't hurt on other Linux versions set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} -lz -lpthread)
# in some builds we appear to be missing libz for some strange reason... elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} -lz -lpthread) execute_process(
elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin") COMMAND sh scripts/get-version linux
execute_process( WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
COMMAND sh scripts/get-version linux OUTPUT_VARIABLE SSRF_VERSION_STRING
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_STRIP_TRAILING_WHITESPACE
OUTPUT_VARIABLE SSRF_VERSION_STRING )
OUTPUT_STRIP_TRAILING_WHITESPACE set(SUBSURFACE_TARGET Subsurface)
) find_library(APP_SERVICES_LIBRARY ApplicationServices)
set(SUBSURFACE_TARGET Subsurface) find_library(HID_LIB HidApi)
find_library(APP_SERVICES_LIBRARY ApplicationServices) set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} ${HID_LIB})
find_library(HID_LIB HidApi) set(EXTRA_LIBS ${APP_SERVICES_LIBRARY})
set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} ${HID_LIB}) set(ICON_FILE ${CMAKE_SOURCE_DIR}/packaging/macosx/Subsurface.icns)
set(EXTRA_LIBS ${APP_SERVICES_LIBRARY}) set(MACOSX_BUNDLE_INFO_STRING "Subsurface")
set(ICON_FILE ${CMAKE_SOURCE_DIR}/packaging/macosx/Subsurface.icns) set(MACOSX_BUNDLE_ICON_FILE Subsurface.icns)
set(MACOSX_BUNDLE_INFO_STRING "Subsurface") set(MACOSX_BUNDLE_GUI_IDENTIFIER "org.subsurface-divelog")
set(MACOSX_BUNDLE_ICON_FILE Subsurface.icns) set(MACOSX_BUNDLE_BUNDLE_NAME "Subsurface")
set(MACOSX_BUNDLE_GUI_IDENTIFIER "org.subsurface-divelog") set(MACOSX_BUNDLE_BUNDLE_VERSION "${SSRF_VERSION_STRING}")
set(MACOSX_BUNDLE_BUNDLE_NAME "Subsurface") set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${SSRF_VERSION_STRING}")
set(MACOSX_BUNDLE_BUNDLE_VERSION "${SSRF_VERSION_STRING}") set(MACOSX_BUNDLE_LONG_VERSION_STRING "${SSRF_VERSION_STRING}")
set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${SSRF_VERSION_STRING}") set(MACOSX_BUNDLE_COPYRIGHT "Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others")
set(MACOSX_BUNDLE_LONG_VERSION_STRING "${SSRF_VERSION_STRING}") set_source_files_properties(${ICON_FILE} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
set(MACOSX_BUNDLE_COPYRIGHT "Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others") set(SUBSURFACE_PKG MACOSX_BUNDLE ${ICON_FILE})
set_source_files_properties(${ICON_FILE} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources") elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
set(SUBSURFACE_PKG MACOSX_BUNDLE ${ICON_FILE}) set(SUBSURFACE_TARGET subsurface)
elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows") set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} -lwsock32 -lws2_32)
set(SUBSURFACE_TARGET subsurface) remove_definitions(-DUNICODE)
set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} -lwsock32 -lws2_32) add_definitions(-mwindows -D_WIN32)
remove_definitions(-DUNICODE)
add_definitions(-mwindows -D_WIN32)
endif()
endif() endif()
if(BTSUPPORT) if(BTSUPPORT)
list(APPEND QT_EXTRA_COMPONENTS Bluetooth) list(APPEND QT_EXTRA_COMPONENTS Bluetooth)
list(APPEND QT_EXTRA_LIBRARIES Qt5::Bluetooth) list(APPEND QT_EXTRA_LIBRARIES Qt5::Bluetooth)