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

smtk2ssrf: build fix

Browse source 
This allows building on Mac and deals with the new dependency in the core
library.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2018-09-09 12:11:06 -07:00
parent 7e243fe363
commit 93ba8c583a
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
smtk-import/CMakeLists.txt
View file

@ -42,6 +42,7 @@ find_package(Qt5 REQUIRED COMPONENTS Core
Test Test
LinguistTools LinguistTools
Positioning Positioning
Quick
Bluetooth) Bluetooth)
set(QT_LIBRARIES Qt5::Core set(QT_LIBRARIES Qt5::Core
@ -50,6 +51,7 @@ set(QT_LIBRARIES Qt5::Core
Qt5::Network Qt5::Network
Qt5::Svg Qt5::Svg
Qt5::Positioning Qt5::Positioning
Qt5::Quick
Qt5::Bluetooth) Qt5::Bluetooth)
set(QT5_INCLUDE_PATH ${Qt5_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS} ${Qt5Core_INCLUDE_DIRS}) set(QT5_INCLUDE_PATH ${Qt5_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS} ${Qt5Core_INCLUDE_DIRS})
@ -65,7 +67,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
NAMES subsurface_corelib NAMES subsurface_corelib
PATHS ${CMAKE_BINARY_DIR}/../subsurface/core PATHS ${CMAKE_BINARY_DIR}/../subsurface/core
) )
elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux") elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Darwin")
find_library(SSRF_CORELIB find_library(SSRF_CORELIB
NAMES subsurface_corelib NAMES subsurface_corelib
PATHS ${SSRF_PATH}build/core PATHS ${SSRF_PATH}build/core