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

Add HandleFindMarble.cmake

Browse source 
Marble stuff should be inside handleMarble file, this clears
the Main CMakelists.txt file.

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
This commit is contained in:
Tomaz Canabrava 2015-11-17 18:04:14 -02:00 • committed by Dirk Hohndel
parent 126d9a00e4
commit cef86356f5
2 changed files with 21 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
CMakeLists.txt
View file

@ -88,7 +88,7 @@ include(cmake/Modules/pkgconfig_helper.cmake)
# module file. # module file.
include(cmake/Modules/HandleFindGit2.cmake) include(cmake/Modules/HandleFindGit2.cmake)
include(cmake/Modules/HandleFindLibDiveComputer.cmake) include(cmake/Modules/HandleFindLibDiveComputer.cmake)
include(cmake/Modules/HandleFindMarble.cmake)
pkg_config_library(LIBXML libxml-2.0 REQUIRED) pkg_config_library(LIBXML libxml-2.0 REQUIRED)
pkg_config_library(LIBSQLITE3 sqlite3 REQUIRED) pkg_config_library(LIBSQLITE3 sqlite3 REQUIRED)
pkg_config_library(LIBXSLT libxslt REQUIRED) pkg_config_library(LIBXSLT libxslt REQUIRED)
@ -100,26 +100,6 @@ if(SMARTTRAK_IMPORT)
pkg_config_library(LIBMDB libmdb REQUIRED) pkg_config_library(LIBMDB libmdb REQUIRED)
endif() endif()
# setup marble
if(NOT NO_MARBLE)
if(LIBMARBLE_FROM_PKGCONFIG)
pkg_config_library(MARBLE libmarble REQUIRED)
set(MARBLE_LIBRARIES "")
else()
find_package(MARBLE QUIET)
if(MARBLE_FOUND)
include_directories(${MARBLE_INCLUDE_DIR})
else()
set(NO_MARBLE ON)
endif()
endif()
else()
message(STATUS "building without marble widget support")
add_definitions(-DNO_MARBLE)
set(MARBLE_LIBRARIES "")
endif()
if(FTDISUPPORT) if(FTDISUPPORT)
message(STATUS "building with libftdi support") message(STATUS "building with libftdi support")
pkg_config_library(LIBFTDI libftdi QUIET) pkg_config_library(LIBFTDI libftdi QUIET)
@ -156,7 +136,6 @@ else()
endif() endif()
set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} ${LIBDIVECOMPUTER_LIBRARIES} ${LIBGIT2_LIBRARIES} ${LIBUSB_LIBRARIES}) set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} ${LIBDIVECOMPUTER_LIBRARIES} ${LIBGIT2_LIBRARIES} ${LIBUSB_LIBRARIES})
add_custom_target(link_marble_data ALL COMMAND rm -rf ./marbledata && ln -s ${CMAKE_SOURCE_DIR}/marbledata ${CMAKE_BINARY_DIR}/marbledata)
# configure Qt. # configure Qt.
if(SUBSURFACE_MOBILE) if(SUBSURFACE_MOBILE)

20
cmake/Modules/HandleFindMarble.cmake Normal file
View file

@ -0,0 +1,20 @@
# setup marble
if(NOT NO_MARBLE)
if(LIBMARBLE_FROM_PKGCONFIG)
pkg_config_library(MARBLE libmarble REQUIRED)
set(MARBLE_LIBRARIES "")
else()
find_package(MARBLE QUIET)
if(MARBLE_FOUND)
include_directories(${MARBLE_INCLUDE_DIR})
else()
set(NO_MARBLE ON)
endif()
endif()
add_custom_target(link_marble_data ALL COMMAND rm -rf ./marbledata && ln -s ${CMAKE_SOURCE_DIR}/marbledata ${CMAKE_BINARY_DIR}/marbledata)
else()
message(STATUS "building without marble widget support")
add_definitions(-DNO_MARBLE)
set(MARBLE_LIBRARIES "")
endif()