Hi!
I have a small cmake-patch for building kuickshow. Please have a look at
it and commit this too trunk.
Thanks
By
Marcus
Index: kdegraphics/cmake/modules/FindIMLIB.cmake
===================================================================
--- kdegraphics/cmake/modules/FindIMLIB.cmake (Revision 564004)
+++ kdegraphics/cmake/modules/FindIMLIB.cmake (Arbeitskopie)
@@ -20,7 +20,7 @@
# in the FIND_PATH() and FIND_LIBRARY() calls
INCLUDE(UsePkgConfig)
- PKGCONFIG(libagg _IMLIBIncDir _IMLIBLinkDir _IMLIBLinkFlags _IMLIBCflags)
+ PKGCONFIG(imlib _IMLIBIncDir _IMLIBLinkDir _IMLIBLinkFlags _IMLIBCflags)
set(IMLIB_DEFINITIONS ${_IMLIBCflags})
@@ -30,17 +30,17 @@
/usr/local/include
)
- FIND_LIBRARY(IMLIB_LIBRARIES NAMES Imlib
+ FIND_LIBRARY(IMLIB_LIBRARIES NAMES Imlib libImlib
PATHS
${_IMLIBLinkDir}
/usr/lib
/usr/local/lib
)
-
+
if (IMLIB_INCLUDE_DIR AND IMLIB_LIBRARIES)
- SET(imlib_found true)
+ SET(IMLIB_FOUND true)
endif (IMLIB_INCLUDE_DIR AND IMLIB_LIBRARIES)
-
+
if (IMLIB_FOUND)
set(CACHED_IMLIB "YES")
if (NOT IMLIB_FIND_QUIETLY)
@@ -48,6 +48,9 @@
endif (NOT IMLIB_FIND_QUIETLY)
else (IMLIB_FOUND)
set(CACHED_IMLIB "NO")
+ if (NOT IMLIB_FIND_QUIETLY)
+ message(STATUS "didn't find IMLIB")
+ endif (NOT IMLIB_FIND_QUIETLY)
if (IMLIB_FIND_REQUIRED)
message(FATAL_ERROR "Could NOT find IMLIB")
endif (IMLIB_FIND_REQUIRED)
Index: kdegraphics/CMakeLists.txt
===================================================================
--- kdegraphics/CMakeLists.txt (Revision 564004)
+++ kdegraphics/CMakeLists.txt (Arbeitskopie)
@@ -12,10 +12,12 @@
macro_optional_find_package(Gphoto2)
macro_optional_find_package(Sane)
macro_optional_find_package(OpenGL)
+macro_optional_find_package(IMLIB)
MACRO_LOG_FEATURE(GPHOTO2_FOUND "libgphoto2" "Need to build kamera project" "http://heanet.dl.sourceforge.net/sourceforge/gphoto/"; FALSE "" "")
MACRO_LOG_FEATURE(SANE_FOUND "libsane" "Sane lib is needed to build kooka project" "http://www.sane-project.org/"; FALSE "" "")
-MACRO_LOG_FEATURE(OPENGL_FOUND "libopengl" "OpenGl lib is need to build kpovmodeler project" "http://www.X.org"; FALSE "" "")
+MACRO_LOG_FEATURE(OPENGL_FOUND "libopengl" "OpenGl lib is need to build kpovmodeler project" "http://www.X.org/"; FALSE "" "")
+MACRO_LOG_FEATURE(IMLIB_FOUND "imlib" "imlib is need to build kuickshow project" "http://www.gnome.org/"; FALSE "" "")
# are these two really required ?
find_package(ZLIB REQUIRED)
@@ -66,7 +68,8 @@
add_subdirectory(kruler)
add_subdirectory(ksnapshot)
if (IMLIB_FOUND)
- add_subdirectory(kuickshow)
+ MESSAGE(STATUS "port kuickshow!")
+ #add_subdirectory(kuickshow)
endif (IMLIB_FOUND)
add_subdirectory(kviewshell)
_______________________________________________
Kde-buildsystem mailing list
[email protected]
https://mail.kde.org/mailman/listinfo/kde-buildsystem
