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

cmake cleanup

Browse source 
- don't reference .so files, reference libraries
- handle libdivecomputer just like the other libraries
- add the ability to link libdivecomputer statically

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-03-25 14:31:42 -07:00
parent 5bf23381e0
commit 24a1ab461b
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
CMakeLists.txt
View file

@ -28,18 +28,25 @@ ELSE()
include_directories(${LIBGIT2DEVEL}/include) include_directories(${LIBGIT2DEVEL}/include)
link_directories(${LIBGIT2DEVEL}/build) link_directories(${LIBGIT2DEVEL}/build)
if(LIBGIT2STATIC STREQUAL "") if(LIBGIT2STATIC STREQUAL "")
set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} libgit2.so libssl.so libcrypto.so) set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} -lgit2 -lssl -lcrypto)
ELSE() ELSE()
set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} libgit2.a libssl.so libcrypto.so) set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} libgit2.a -lssl -lcrypto)
ENDIF() ENDIF()
ENDIF() ENDIF()
pkg_config_library(LIBXSLT libxslt) pkg_config_library(LIBXSLT libxslt)
SET(LIBDCDEVEL "" CACHE STRING "libraries") SET(LIBDCDEVEL "" CACHE STRING "libraries")
IF(NOT (LIBDCDEVEL STREQUAL "")) IF(DEFINED LIBDCDEVEL)
cmake_policy(SET CMP0015 OLD) cmake_policy(SET CMP0015 OLD)
include_directories(${LIBDCDEVEL}/include ) include_directories(${LIBDCDEVEL}/include )
link_directories(${LIBDCDEVEL}/src/.libs) link_directories(${LIBDCDEVEL}/src/.libs)
if(LIBDCSTATIC STREQUAL "")
set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} -ldivecomputer)
ELSE()
set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} libdivecomputer.a -lusb-1.0)
ENDIF()
ELSE()
set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} -ldivecomputer)
ENDIF() ENDIF()
STRING(COMPARE EQUAL "${${PROJECT_NAME}_SOURCE_DIR}" "${${PROJECT_NAME}_BINARY_DIR}" insource) STRING(COMPARE EQUAL "${${PROJECT_NAME}_SOURCE_DIR}" "${${PROJECT_NAME}_BINARY_DIR}" insource)
@ -66,7 +73,7 @@ IF(NOT DEFINED LIBMARBLEDEVEL)
INCLUDE_DIRECTORIES(${MARBLE_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${MARBLE_INCLUDE_DIR})
ELSE() ELSE()
INCLUDE_DIRECTORIES(${LIBMARBLEDEVEL}/include) INCLUDE_DIRECTORIES(${LIBMARBLEDEVEL}/include)
SET(MARBLE_LIBRARIES ${LIBMARBLEDEVEL}/lib/libssrfmarblewidget.so) SET(MARBLE_LIBRARIES -L${LIBMARBLEDEVEL}/lib -lssrfmarblewidget)
ENDIF() ENDIF()
# Generate the ssrf-config.h every 'make' # Generate the ssrf-config.h every 'make'
@ -249,7 +256,6 @@ target_link_libraries( subsurface
subsurface_statistics subsurface_statistics
subsurface_corelib subsurface_corelib
${SUBSURFACE_LINK_LIBRARIES} ${SUBSURFACE_LINK_LIBRARIES}
-ldivecomputer
-lzip -lzip
) )
@ -261,7 +267,7 @@ ADD_DEPENDENCIES(subsurface_corelib version)
MACRO(test NAME FILE) MACRO(test NAME FILE)
ADD_EXECUTABLE(${NAME} tests/${FILE} ${SUBSURFACE_RESOURCES}) ADD_EXECUTABLE(${NAME} tests/${FILE} ${SUBSURFACE_RESOURCES})
TARGET_LINK_LIBRARIES(${NAME} subsurface_corelib ${QT_TEST_LIBRARIES} ${SUBSURFACE_LINK_LIBRARIES} -lzip -ldivecomputer) TARGET_LINK_LIBRARIES(${NAME} subsurface_corelib ${QT_TEST_LIBRARIES} ${SUBSURFACE_LINK_LIBRARIES} -lzip )
ADD_TEST(NAME ${NAME} COMMAND ${NAME}) ADD_TEST(NAME ${NAME} COMMAND ${NAME})
ENDMACRO() ENDMACRO()