diff options
| author | Felix Geyer <debfx@fobos.de> | 2011-11-12 17:30:16 +0400 |
|---|---|---|
| committer | Felix Geyer <debfx@fobos.de> | 2011-11-12 17:30:16 +0400 |
| commit | 9b46225937b1ec52a3c805abd46b139a87e1c550 (patch) | |
| tree | 32d0b71dac57c75dbc9b82198dcc20c2ed2f34a7 | |
| parent | 9ffa5232f5406c8d5ba76bc8857f14d43c6aec77 (diff) | |
Fix cmake files to use new gcrypt variables.
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | utils/CMakeLists.txt | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c670cfde7..19ed4e9f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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") endif(NOT ZLIB_SUPPORTS_GZIP) +include_directories(${GCRYPT_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}) + add_subdirectory(src) add_subdirectory(utils) if( WITH_TESTS ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e982daa88..3052df47e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -91,4 +91,4 @@ qt4_wrap_cpp(keepassx_SOURCES ${keepassx_MOC}) add_library( keepassx_core STATIC ${keepassx_SOURCES} ) 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} ) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index accd015c5..e4cfeb03d 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -91,7 +91,7 @@ set(TEST_LIBRARIES ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} - ${LIBGCRYPT_LIBS} + ${GCRYPT_LIBRARIES} ${ZLIB_LIBRARIES} ) diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt index 0eafdb14d..a75ef431e 100644 --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt @@ -16,4 +16,4 @@ include_directories(../src) 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} ) |