Fix cmake files to use new gcrypt variables.

This commit is contained in:
Felix Geyer 2011-11-12 14:30:16 +01:00
parent 9ffa5232f5
commit 9b46225937
4 changed files with 5 additions and 3 deletions

View File

@ -73,6 +73,8 @@ if(NOT ZLIB_SUPPORTS_GZIP)
message(FATAL_ERROR "zlib 1.2.x or higher is required to use the gzip format") message(FATAL_ERROR "zlib 1.2.x or higher is required to use the gzip format")
endif(NOT ZLIB_SUPPORTS_GZIP) endif(NOT ZLIB_SUPPORTS_GZIP)
include_directories(${GCRYPT_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
add_subdirectory(src) add_subdirectory(src)
add_subdirectory(utils) add_subdirectory(utils)
if( WITH_TESTS ) if( WITH_TESTS )

View File

@ -91,4 +91,4 @@ qt4_wrap_cpp(keepassx_SOURCES ${keepassx_MOC})
add_library( keepassx_core STATIC ${keepassx_SOURCES} ) add_library( keepassx_core STATIC ${keepassx_SOURCES} )
add_executable( ${PROGNAME} WIN32 MACOSX_BUNDLE main.cpp ) add_executable( ${PROGNAME} WIN32 MACOSX_BUNDLE main.cpp )
target_link_libraries( ${PROGNAME} keepassx_core ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${LIBGCRYPT_LIBS} ${ZLIB_LIBRARIES} ) target_link_libraries( ${PROGNAME} keepassx_core ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${GCRYPT_LIBRARIES} ${ZLIB_LIBRARIES} )

View File

@ -91,7 +91,7 @@ set(TEST_LIBRARIES
${QT_QTCORE_LIBRARY} ${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY} ${QT_QTGUI_LIBRARY}
${QT_QTTEST_LIBRARY} ${QT_QTTEST_LIBRARY}
${LIBGCRYPT_LIBS} ${GCRYPT_LIBRARIES}
${ZLIB_LIBRARIES} ${ZLIB_LIBRARIES}
) )

View File

@ -16,4 +16,4 @@
include_directories(../src) include_directories(../src)
add_executable( kdbx-extract kdbx-extract.cpp ) add_executable( kdbx-extract kdbx-extract.cpp )
target_link_libraries( kdbx-extract keepassx_core ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${LIBGCRYPT_LIBS} ${ZLIB_LIBRARIES} ) target_link_libraries( kdbx-extract keepassx_core ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${GCRYPT_LIBRARIES} ${ZLIB_LIBRARIES} )