[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdelibs
From: Alexander Neundorf <neundorf () kde ! org>
Date: 2006-01-22 16:41:22
Message-ID: 1137948082.510024.24165.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 501328 by neundorf:
-detect bzip2 and cups
-compile the keramik style
-compile kdeprint/cups
Alex
M +0 -4 CMakeLists.txt
M +13 -2 ConfigureChecks.cmake
M +10 -2 config.h.cmake
M +6 -0 kdecore/CMakeLists.txt
M +6 -1 kdeprint/CMakeLists.txt
M +4 -3 kdeprint/cups/CMakeLists.txt
M +1 -1 kdeprint/cups/cupsdconf2/CMakeLists.txt
M +7 -6 kio/CMakeLists.txt
M +1 -0 kstyles/keramik/CMakeLists.txt
--- trunk/KDE/kdelibs/CMakeLists.txt #501327:501328
@@ -17,10 +17,6 @@
include(ConfigureChecks.cmake)
-if (HAVE_SSL)
- set(KSSL_HAVE_SSL ON)
-endif (HAVE_SSL)
-
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/kdemacros.h.cmake \
${CMAKE_CURRENT_BINARY_DIR}/kdemacros.h )
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake \
${CMAKE_CURRENT_BINARY_DIR}/config.h )
--- trunk/KDE/kdelibs/ConfigureChecks.cmake #501327:501328
@@ -14,6 +14,16 @@
set(HAVE_LIBZ 0)
endif(ZLIB_FOUND)
+find_package(BZip2)
+if(BZIP2_FOUND)
+ set(HAVE_BZIP2_SUPPORT 1)
+ if(BZIP2_NEED_PREFIX)
+ set(NEED_BZ2_PREFIX 1)
+ endif(BZIP2_NEED_PREFIX)
+else(BZIP2_FOUND)
+ set(HAVE_BZIP2_SUPPORT 0)
+endif(BZIP2_FOUND)
+
#check for png
find_package(PNG)
if(PNG_FOUND)
@@ -207,8 +217,9 @@
check_library_exists(util openpty "" HAVE_OPENPTY)
check_library_exists(volmgt volmgt_running "" HAVE_VOLMGT)
-find_library(ICE_LIB NAMES ICE PATHS /usr/X11/lib)
-check_library_exists(${ICE_LIB} _IceTransNoListen "" HAVE__ICETRANSNOLISTEN)
+# it seems this isn't used anywhere
+#find_library(ICE_LIB NAMES ICE PATHS /usr/X11/lib)
+#check_library_exists(${ICE_LIB} _IceTransNoListen "" HAVE__ICETRANSNOLISTEN)
#set(CMAKE_REQUIRED_LIBRARIES crypt)
#check_function_exists(crypt "" HAVE_CRYPT)
--- trunk/KDE/kdelibs/config.h.cmake #501327:501328
@@ -89,8 +89,12 @@
/* from here on everything is tested for correctly (more or less) */
+#cmakedefine HAVE_BZIP2_SUPPORT
+/* Define if the libbz2 functions need the BZ2_ prefix */
+#cmakedefine NEED_BZ2_PREFIX
+
/* Define if you have libz */
-#cmakedefine01 HAVE_LIBZ
+#cmakedefine HAVE_LIBZ
/* Define if you have libpng */
#cmakedefine01 HAVE_LIBPNG
@@ -274,11 +278,15 @@
#cmakedefine HAVE_UTEMPTER
#cmakedefine HAVE_VSNPRINTF
#cmakedefine HAVE__GETPTY
-#cmakedefine HAVE__ICETRANSNOLISTEN
#cmakedefine HAVE___ARGZ_COUNT
#cmakedefine HAVE___ARGZ_NEXT
#cmakedefine HAVE___ARGZ_STRINGIFY
+/* this one seems to be unused:
+#cmakedefine HAVE__ICETRANSNOLISTEN
+*/
+
+
#cmakedefine HAVE_S_ISSOCK
#cmakedefine01 TIME_WITH_SYS_TIME
--- trunk/KDE/kdelibs/kdecore/CMakeLists.txt #501327:501328
@@ -8,6 +8,9 @@
message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}: skipped subdir $(SVGICONS)")
include_directories( ${CMAKE_SOURCE_DIR}/kdefx ${CMAKE_SOURCE_DIR}/kdecore/network \
${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} \
${CMAKE_CURRENT_BINARY_DIR} )
+if(BZIP2_FOUND)
+ include_directories(${BZIP2_INCLUDE_DIR})
+endif(BZIP2_FOUND)
########### next target ###############
@@ -153,6 +156,9 @@
kde4_add_library(kdecore SHARED ${kdecore_LIB_SRCS})
target_link_libraries(kdecore ${QT_QTCORE_LIBRARY} ${QT_QT3SUPPORT_LIBRARY} \
${QT_QTGUI_LIBRARY} ${ZLIB_LIBRARY} ${X11_LIBRARIES} DCOP) +if(BZIP2_FOUND)
+ target_link_libraries(kdecore ${BZIP2_LIBRARY})
+endif(BZIP2_FOUND)
set_target_properties(kdecore PROPERTIES VERSION 4.2.0 SOVERSION 4 )
install_targets(/lib kdecore )
--- trunk/KDE/kdelibs/kdeprint/CMakeLists.txt #501327:501328
@@ -1,5 +1,7 @@
kde4_header()
+find_package(Cups)
+
add_subdirectory( management )
add_subdirectory( lpdunix )
add_subdirectory( lpr )
@@ -10,7 +12,10 @@
add_subdirectory( tools )
add_subdirectory( tests )
-message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}: skipped subdir $(CUPSSUBDIR)")
+if(CUPS_FOUND)
+ add_subdirectory(cups)
+endif(CUPS_FOUND)
+
include_directories( ${CMAKE_SOURCE_DIR}/kdefx ${CMAKE_SOURCE_DIR}/kded \
${CMAKE_SOURCE_DIR}/kdecore/network ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} \
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
--- trunk/KDE/kdelibs/kdeprint/cups/CMakeLists.txt #501327:501328
@@ -2,7 +2,7 @@
add_subdirectory( cupsdconf2 )
-include_directories( ${CMAKE_SOURCE_DIR}/kdecore ${CMAKE_SOURCE_DIR}/kdecore/network \
${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kfile ${CMAKE_SOURCE_DIR}/kdeprint \
${CMAKE_SOURCE_DIR}/kdeprint/management ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} \
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) +include_directories( \
${CUPS_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/kdecore ${CMAKE_SOURCE_DIR}/kdecore/network \
${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kfile ${CMAKE_SOURCE_DIR}/kdeprint \
${CMAKE_SOURCE_DIR}/kdeprint/management ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} \
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
########### next target ###############
@@ -45,7 +45,7 @@
kde4_add_plugin(kdeprint_cups ${kdeprint_cups_PART_SRCS})
-target_link_libraries(kdeprint_cups ${QT_AND_KDECORE_LIBS} kdeprint_management kio \
kdefakes ) +target_link_libraries(kdeprint_cups ${QT_AND_KDECORE_LIBS} \
kdeprint_management kio kdefakes ${CUPS_LIBRARY} )
install_targets(/lib/kde4 kdeprint_cups )
@@ -54,6 +54,7 @@
set(make_driver_db_cups_SRCS
make_driver_db_cups.c
+${CMAKE_CURRENT_SOURCE_DIR}/../driverparse.c
)
kde4_automoc(${make_driver_db_cups_SRCS})
@@ -75,7 +76,7 @@
kde4_add_executable(cupsdoprint ${cupsdoprint_SRCS})
-target_link_libraries(cupsdoprint ${QT_AND_KDECORE_LIBS} kdefakes )
+target_link_libraries(cupsdoprint ${QT_AND_KDECORE_LIBS} kdefakes ${CUPS_LIBRARY})
install_targets(/bin cupsdoprint )
--- trunk/KDE/kdelibs/kdeprint/cups/cupsdconf2/CMakeLists.txt #501327:501328
@@ -35,7 +35,7 @@
kde4_add_klm( cupsdconf ${cupsdconf_KDEINIT_SRCS})
-target_link_libraries(kdeinit_cupsdconf ${QT_AND_KDECORE_LIBS} kio )
+target_link_libraries(kdeinit_cupsdconf ${QT_AND_KDECORE_LIBS} kio ${CUPS_LIBRARY})
install_targets(/lib kdeinit_cupsdconf )
--- trunk/KDE/kdelibs/kio/CMakeLists.txt #501327:501328
@@ -1,6 +1,12 @@
kde4_header()
-add_subdirectory( kssl )
+
+if(HAVE_SSL)
+ set(KSSL_HAVE_SSL 1)
+ add_definitions(-DKSSL_HAVE_SSL )
+endif(HAVE_SSL)
+
+add_subdirectory( kssl )
add_subdirectory( kio )
add_subdirectory( bookmarks )
add_subdirectory( kfile )
@@ -19,11 +25,6 @@
########### next target ###############
-if(HAVE_SSL)
- message(STATUS "KSSL_HAVE_SSL should go into kdelibs/config.h, will move it \
later")
- add_definitions(-DKSSL_HAVE_SSL)
-endif(HAVE_SSL)
-
set(kio_LIB_SRCS
${kiocore_STAT_SRCS}
${kbookmarks_STAT_SRCS}
--- trunk/KDE/kdelibs/kstyles/keramik/CMakeLists.txt #501327:501328
@@ -23,6 +23,7 @@
colorutil.cpp
)
+# this actually shouldn't be required, maybe current cmake cvs handles it correctly, \
Alex set_source_files_properties(keramik.cpp PROPERTIES OBJECT_DEPENDS \
${CMAKE_CURRENT_BINARY_DIR}/keramikrc.h)
kde4_automoc(${keramik_PART_SRCS})
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic