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

Make it compilant with the build script

Browse source 
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2015-04-07 16:13:27 -07:00 • committed by Dirk Hohndel
parent 6f93590705
commit c2bdc58fb8
4 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -39,9 +39,13 @@ ELSE()
ENDIF() ENDIF()
FIND_PACKAGE(Libdivecomputer REQUIRED) FIND_PACKAGE(Libdivecomputer REQUIRED)
INCLUDE_DIRECTORIES(${LIBDIVECOMPUTER_INCLUDE_DIR})
FIND_PACKAGE(Marble REQUIRED) FIND_PACKAGE(Marble REQUIRED)
include_directories(${MARBLE_INCLUDE_DIR}) include_directories(${MARBLE_INCLUDE_DIR})
SET(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} ${LIBDIVECOMPUTER_LIBRARIES} ${LIBGIT2_LIBRARIES} -lusb-1.0)
# handle out of tree build correctly # handle out of tree build correctly
STRING(COMPARE EQUAL "${${PROJECT_NAME}_SOURCE_DIR}" "${${PROJECT_NAME}_BINARY_DIR}" insource) STRING(COMPARE EQUAL "${${PROJECT_NAME}_SOURCE_DIR}" "${${PROJECT_NAME}_BINARY_DIR}" insource)

2
cmake/Modules/FindLIBGIT2.cmake
View file

@ -16,6 +16,7 @@ ENDIF ()
FIND_PATH( LIBGIT2_INCLUDE_DIR FIND_PATH( LIBGIT2_INCLUDE_DIR
NAMES git2.h NAMES git2.h
HINTS HINTS
${CMAKE_CURRENT_SOURCE_DIR}/../install/include
${CMAKE_CURRENT_SOURCE_DIR}/../libgit2/include ${CMAKE_CURRENT_SOURCE_DIR}/../libgit2/include
/usr/local/include /usr/local/include
/usr/include /usr/include
@ -26,6 +27,7 @@ NAMES
libgit2.a libgit2.a
git2 git2
HINTS HINTS
${CMAKE_CURRENT_SOURCE_DIR}/../install/lib
${CMAKE_CURRENT_SOURCE_DIR}/../libgit2/build ${CMAKE_CURRENT_SOURCE_DIR}/../libgit2/build
/usr/local/include /usr/local/include
/usr/include /usr/include

2
cmake/Modules/FindLibdivecomputer.cmake
View file

@ -16,6 +16,7 @@ ENDIF ( LIBDIVECOMPUTER_INCLUDE_DIR AND LIBDIVECOMPUTER_LIBRARIES )
FIND_PATH( LIBDIVECOMPUTER_INCLUDE_DIR FIND_PATH( LIBDIVECOMPUTER_INCLUDE_DIR
NAMES libdivecomputer/hw.h NAMES libdivecomputer/hw.h
HINTS HINTS
${CMAKE_CURRENT_SOURCE_DIR}/../install/include
${CMAKE_CURRENT_SOURCE_DIR}/../libdivecomputer/include/ ${CMAKE_CURRENT_SOURCE_DIR}/../libdivecomputer/include/
/usr/local/include /usr/local/include
/usr/include /usr/include
@ -26,6 +27,7 @@ NAMES
libdivecomputer.a libdivecomputer.a
divecomputer divecomputer
HINTS HINTS
${CMAKE_CURRENT_SOURCE_DIR}/../install/lib
${CMAKE_CURRENT_SOURCE_DIR}/../libdivecomputer/src/.libs/ ${CMAKE_CURRENT_SOURCE_DIR}/../libdivecomputer/src/.libs/
/usr/local/include /usr/local/include
/usr/include /usr/include

2
cmake/Modules/FindMarble.cmake
View file

@ -16,6 +16,7 @@ ENDIF ( MARBLE_INCLUDE_DIR AND MARBLE_LIBRARIES )
FIND_PATH( MARBLE_INCLUDE_DIR FIND_PATH( MARBLE_INCLUDE_DIR
NAMES marble/MarbleModel.h NAMES marble/MarbleModel.h
HINTS HINTS
${CMAKE_CURRENT_SOURCE_DIR}/../install/include
${CMAKE_CURRENT_SOURCE_DIR}/../marble/src/lib ${CMAKE_CURRENT_SOURCE_DIR}/../marble/src/lib
${CMAKE_CURRENT_SOURCE_DIR}/../marble-source/src/lib ${CMAKE_CURRENT_SOURCE_DIR}/../marble-source/src/lib
/usr/local/include /usr/local/include
@ -27,6 +28,7 @@ NAMES
ssrfmarblewidget ssrfmarblewidget
marblewidget marblewidget
HINTS HINTS
${CMAKE_CURRENT_SOURCE_DIR}/../install/lib
${CMAKE_CURRENT_SOURCE_DIR}/../marble ${CMAKE_CURRENT_SOURCE_DIR}/../marble
${CMAKE_CURRENT_SOURCE_DIR}/../marble-source ${CMAKE_CURRENT_SOURCE_DIR}/../marble-source
/usr/local/include /usr/local/include