FlapJackApps/subsurface
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cmake: handle libzip like the other libraries

Browse Source 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-03-25 14:48:02 -07:00
parent 24a1ab461b
commit 405e52fef9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -34,6 +34,7 @@ ELSE()
ENDIF() ENDIF()
ENDIF() ENDIF()
pkg_config_library(LIBXSLT libxslt) pkg_config_library(LIBXSLT libxslt)
pkg_config_library(LIBZIP libzip)
SET(LIBDCDEVEL "" CACHE STRING "libraries") SET(LIBDCDEVEL "" CACHE STRING "libraries")
IF(DEFINED LIBDCDEVEL) IF(DEFINED LIBDCDEVEL)
@ -256,7 +257,6 @@ target_link_libraries( subsurface
subsurface_statistics subsurface_statistics
subsurface_corelib subsurface_corelib
${SUBSURFACE_LINK_LIBRARIES} ${SUBSURFACE_LINK_LIBRARIES}
-lzip
) )
ADD_DEPENDENCIES(subsurface_statistics subsurface_generated_ui) ADD_DEPENDENCIES(subsurface_statistics subsurface_generated_ui)
@ -267,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 ) TARGET_LINK_LIBRARIES(${NAME} subsurface_corelib ${QT_TEST_LIBRARIES} ${SUBSURFACE_LINK_LIBRARIES})
ADD_TEST(NAME ${NAME} COMMAND ${NAME}) ADD_TEST(NAME ${NAME} COMMAND ${NAME})
ENDMACRO() ENDMACRO()