diff options
| author |  Fabio Bas | 2010-10-23 14:00:32 +0000 |
|---|---|---|
| committer | Fabio Bas | 2010-10-23 14:00:32 +0000 |
| commit | f2c0616bd914f5ff474c4fa3c1b62dfc5df3d887 (patch) | |
| tree | 0a9e8bb2d1faf7fc6a25f3f154e2332aa590c610 | |
| parent | improved hungarian notation; (diff) | |
| download | KVIrc-f2c0616bd914f5ff474c4fa3c1b62dfc5df3d887.tar.gz KVIrc-f2c0616bd914f5ff474c4fa3c1b62dfc5df3d887.tar.bz2 KVIrc-f2c0616bd914f5ff474c4fa3c1b62dfc5df3d887.zip | |
probable fix for #750
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5103 17fca916-40b9-46aa-a4ea-0a15b648b75c
| -rw-r--r-- | CMakeLists.txt | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a307eccfd..baa4aa0a9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -158,7 +158,7 @@ IF(CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo OR ENDIF() OPTION(WANT_STRIP "Strip binaries (discard symbols from object files)" OFF) - + IF(WANT_ENV_FLAGS) SET(CMAKE_BUILD_TYPE Undefined) SET(CMAKE_STATUS_DEBUG_SUPPORT "Environment-driven") @@ -499,14 +499,15 @@ IF(UNIX) FIND_PACKAGE(X11) IF(X11_FOUND) SET(COMPILE_X11_SUPPORT 1) - CHECK_INCLUDE_FILE(X11/extensions/scrnsaver.h CMAKE_HAVE_X11_SCRNSAVER_H) - IF(CMAKE_HAVE_X11_SCRNSAVER_H) + IF(X11_Xscreensaver_FOUND) SET(COMPILE_XSS_SUPPORT 1) SET(CMAKE_STATUS_X11_SUPPORT "Yes, with scrnsaverproto") + INCLUDE_DIRECTORIES(${X11_Xscreensaver_INCLUDE_PATH}) + LIST(APPEND LIBS ${X11_Xscreensaver_LIB}) ELSE() SET(CMAKE_STATUS_X11_SUPPORT "Yes") ENDIF() - + INCLUDE_DIRECTORIES(${X11_INCLUDE_DIR}) LIST(APPEND LIBS ${X11_LIBRARIES}) # Seems like ${X11_LIBRARIES} doesn't add -lXrender, which is needed @@ -1038,7 +1039,7 @@ IF(WANT_NO_EMBEDDED_CODE) MESSAGE(STATUS "WANT_NO_EMBEDDED_CODE activated.") FIND_PACKAGE(PkgConfig) - # for every os/distribution + # for every os/distribution pkg_check_modules(CRYPTOPP cryptopp>=5.6.0) # for Debian and derivates |