aboutsummaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/FindFreetype.cmake44
-rw-r--r--modules/FindGStreamer.cmake19
-rw-r--r--modules/FindKDE4Internal.cmake12
-rw-r--r--modules/FindPCRE.cmake12
-rw-r--r--modules/FindRUBY.cmake2
-rw-r--r--modules/FindSharedMimeInfo.cmake6
-rw-r--r--modules/FindSoprano.cmake33
-rw-r--r--modules/FindStrigi.cmake2
-rw-r--r--modules/FindX11.cmake1
-rw-r--r--modules/FindXine.cmake69
-rw-r--r--modules/KDE4Defaults.cmake4
-rw-r--r--modules/KDE4Macros.cmake22
12 files changed, 166 insertions, 60 deletions
diff --git a/modules/FindFreetype.cmake b/modules/FindFreetype.cmake
index 66198b9e..6fd1bb13 100644
--- a/modules/FindFreetype.cmake
+++ b/modules/FindFreetype.cmake
@@ -4,7 +4,7 @@
# FREETYPE_FOUND - system has Freetype
# FREETYPE_INCLUDE_DIRS - the FREETYPE include directories
# FREETYPE_LIBRARIES - Link these to use FREETYPE
-# FREETYPE_INCLUDE_DIR is internal and deprecated for use
+# FREETYPE_INCLUDE_DIR - internal
# Copyright (c) 2006, Laurent Montel, <montel@kde.org>
#
@@ -19,7 +19,7 @@ if (FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIR)
else (FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIR)
- FIND_PROGRAM(FREETYPECONFIG_EXECUTABLE NAMES freetype-config PATHS
+ find_program(FREETYPECONFIG_EXECUTABLE NAMES freetype-config PATHS
/opt/local/bin
)
@@ -30,28 +30,28 @@ else (FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIR)
# if freetype-config has been found
if(FREETYPECONFIG_EXECUTABLE)
- EXEC_PROGRAM(${FREETYPECONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE FREETYPE_LIBRARIES)
+ exec_program(${FREETYPECONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE FREETYPE_LIBRARIES)
- EXEC_PROGRAM(${FREETYPECONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _freetype_pkgconfig_output)
+ exec_program(${FREETYPECONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _freetype_pkgconfig_output)
if(FREETYPE_LIBRARIES AND _freetype_pkgconfig_output)
set(FREETYPE_FOUND TRUE)
# freetype-config can print out more than one -I, so we need to chop it up
# into a list and process each entry separately
- SEPARATE_ARGUMENTS(_freetype_pkgconfig_output)
- FOREACH(value ${_freetype_pkgconfig_output})
- STRING(REGEX REPLACE "-I(.+)" "\\1" value "${value}")
+ separate_arguments(_freetype_pkgconfig_output)
+ foreach(value ${_freetype_pkgconfig_output})
+ string(REGEX REPLACE "-I(.+)" "\\1" value "${value}")
set(FREETYPE_INCLUDE_DIR ${FREETYPE_INCLUDE_DIR} ${value})
- ENDFOREACH(value)
+ endforeach(value)
endif(FREETYPE_LIBRARIES AND _freetype_pkgconfig_output)
- MARK_AS_ADVANCED(FREETYPE_LIBRARIES FREETYPE_INCLUDE_DIR)
+ set( FREETYPE_LIBRARIES ${FREETYPE_LIBRARIES} CACHE STRING "The libraries for freetype" )
- set( FREETYPE_LIBRARIES ${FREETYPE_LIBRARIES} CACHE INTERNAL "The libraries for freetype" )
+ mark_as_advanced(FREETYPE_LIBRARIES FREETYPE_INCLUDE_DIR)
else(FREETYPECONFIG_EXECUTABLE)
- find_path (FREETYPE_INCLUDE_DIR freetype2/freetype/freetype.h)
- set (FREETYPE_INCLUDE_DIR ${FREETYPE_INCLUDE_DIR}/freetype2)
+ find_path (FREETYPE_INCLUDE_DIR freetype2/freetype/freetype.h)
+ set (FREETYPE_INCLUDE_DIR ${FREETYPE_INCLUDE_DIR}/freetype2)
find_library(FREETYPE_LIBRARIES freetype)
if(FREETYPE_INCLUDE_DIR AND FREETYPE_LIBRARIES)
set(FREETYPE_FOUND TRUE)
@@ -59,16 +59,16 @@ else (FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIR)
endif(FREETYPECONFIG_EXECUTABLE)
- IF (FREETYPE_FOUND)
- IF (NOT Freetype_FIND_QUIETLY)
- MESSAGE(STATUS "Found Freetype: ${FREETYPE_LIBRARIES}")
- ENDIF (NOT Freetype_FIND_QUIETLY)
- ELSE (FREETYPE_FOUND)
- IF (Freetype_FIND_REQUIRED)
- MESSAGE(FATAL_ERROR "Could not find FreeType library")
- ENDIF (Freetype_FIND_REQUIRED)
- ENDIF (FREETYPE_FOUND)
+ if (FREETYPE_FOUND)
+ if (NOT Freetype_FIND_QUIETLY)
+ message(STATUS "Found Freetype: ${FREETYPE_LIBRARIES}")
+ endif (NOT Freetype_FIND_QUIETLY)
+ else (FREETYPE_FOUND)
+ if (Freetype_FIND_REQUIRED)
+ message(FATAL_ERROR "Could not find FreeType library")
+ endif (Freetype_FIND_REQUIRED)
+ endif (FREETYPE_FOUND)
endif (FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIR)
-set(FREETYPE_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIR})
+set(FREETYPE_INCLUDE_DIRS "${FREETYPE_INCLUDE_DIR}")
diff --git a/modules/FindGStreamer.cmake b/modules/FindGStreamer.cmake
index 2d752dd9..4398f150 100644
--- a/modules/FindGStreamer.cmake
+++ b/modules/FindGStreamer.cmake
@@ -10,12 +10,12 @@
# TODO: Other versions --> GSTREAMER_X_Y_FOUND (Example: GSTREAMER_0_8_FOUND and GSTREAMER_0_10_FOUND etc)
-IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_INTERFACE_LIBRARY)
+IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)
# in cache already
SET(GStreamer_FIND_QUIETLY TRUE)
-ELSE (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_INTERFACE_LIBRARY)
+ELSE (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)
SET(GStreamer_FIND_QUIETLY FALSE)
-ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_INTERFACE_LIBRARY)
+ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)
IF (NOT WIN32)
# use pkg-config to get the directories and then use these values
@@ -40,6 +40,11 @@ FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-0.10
${_GStreamerLinkDir}
)
+FIND_LIBRARY(GSTREAMER_BASE_LIBRARY NAMES gstbase-0.10
+ PATHS
+ ${_GStreamerLinkDir}
+ )
+
FIND_LIBRARY(GSTREAMER_INTERFACE_LIBRARY NAMES gstinterfaces-0.10
PATHS
${_GStreamerLinkDir}
@@ -63,11 +68,11 @@ ELSE (GSTREAMER_INTERFACE_LIBRARY)
MESSAGE(STATUS "GStreamer: WARNING: interface library not found")
ENDIF (GSTREAMER_INTERFACE_LIBRARY)
-IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_INTERFACE_LIBRARY)
+IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)
SET(GSTREAMER_FOUND TRUE)
-ELSE (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_INTERFACE_LIBRARY)
+ELSE (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)
SET(GSTREAMER_FOUND FALSE)
-ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_INTERFACE_LIBRARY)
+ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)
IF (GSTREAMER_FOUND)
IF (NOT GStreamer_FIND_QUIETLY)
@@ -79,4 +84,4 @@ ELSE (GSTREAMER_FOUND)
ENDIF (GStreamer_FIND_REQUIRED)
ENDIF (GSTREAMER_FOUND)
-MARK_AS_ADVANCED(GSTREAMER_INCLUDE_DIR GSTREAMER_LIBRARIES GSTREAMER_INTERFACE_LIBRARY)
+MARK_AS_ADVANCED(GSTREAMER_INCLUDE_DIR GSTREAMER_LIBRARIES GSTREAMER_BASE_LIBRARY GSTREAMER_INTERFACE_LIBRARY)
diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake
index 03b0e307..c1981470 100644
--- a/modules/FindKDE4Internal.cmake
+++ b/modules/FindKDE4Internal.cmake
@@ -716,7 +716,7 @@ if (UNIX)
set( _KDE4_DEFAULT_USE_FULL_RPATH OFF )
endif (NOT APPLE)
- option(KDE4_USE_ALWAYS_FULL_RPATH "If set to TRUE, also libs and plugins will be linked with the full RPATH, which will usually make them work better, but make install will take longer." _KDE4_DEFAULT_USE_FULL_RPATH)
+ option(KDE4_USE_ALWAYS_FULL_RPATH "If set to TRUE, also libs and plugins will be linked with the full RPATH, which will usually make them work better, but make install will take longer." ${_KDE4_DEFAULT_USE_FULL_RPATH} )
set( _KDE4_PLATFORM_INCLUDE_DIRS)
@@ -946,8 +946,8 @@ if (CMAKE_C_COMPILER MATCHES "icc")
set(CMAKE_C_FLAGS_DEBUG "-O2 -g -Ob0 -noalign")
set(CMAKE_C_FLAGS_DEBUGFULL "-g -Ob0 -noalign")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ansi -Wpointer-arith -fno-common")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ansi -Wpointer-arith -fno-exceptions -fno-common")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ansi -Wall -w1 -Wpointer-arith -fno-common")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ansi -Wall -w1 -Wpointer-arith -fno-exceptions -fno-common")
# visibility support
set(__KDE_HAVE_ICC_VISIBILITY)
@@ -983,13 +983,13 @@ macro (KDE4_PRINT_RESULTS)
# inside kdelibs the include dir and lib dir are internal, not "found"
if (NOT _kdeBootStrapping)
if(KDE4_INCLUDE_DIR)
- message(STATUS "Found KDE 4.0 include dir: ${KDE4_INCLUDE_DIR}")
+ message(STATUS "Found KDE 4.1 include dir: ${KDE4_INCLUDE_DIR}")
else(KDE4_INCLUDE_DIR)
message(STATUS "ERROR: unable to find KDE 4 headers")
endif(KDE4_INCLUDE_DIR)
if(KDE4_LIB_DIR)
- message(STATUS "Found KDE 4 library dir: ${KDE4_LIB_DIR}")
+ message(STATUS "Found KDE 4.1 library dir: ${KDE4_LIB_DIR}")
else(KDE4_LIB_DIR)
message(STATUS "ERROR: unable to find KDE 4 core library")
endif(KDE4_LIB_DIR)
@@ -1030,7 +1030,7 @@ endif (NOT KDE4Internal_FIND_QUIETLY)
#add the found Qt and KDE include directories to the current include path
#the ${KDE4_INCLUDE_DIR}/KDE directory is for forwarding includes, eg. #include <KMainWindow>
-set(KDE4_INCLUDES ${KDE4_INCLUDE_DIR} ${KDE4_INCLUDE_DIR}/KDE ${QT_INCLUDES} ${_KDE4_PLATFORM_INCLUDE_DIRS} )
+set(KDE4_INCLUDES ${KDE4_INCLUDE_DIR} ${KDE4_INCLUDE_DIR}/KDE ${QT_INCLUDES} ${_KDE4_PLATFORM_INCLUDE_DIRS} )
set(KDE4_DEFINITIONS ${_KDE4_PLATFORM_DEFINITIONS} -DQT_NO_STL -DQT_NO_CAST_TO_ASCII -D_REENTRANT -DKDE_DEPRECATED_WARNINGS )
diff --git a/modules/FindPCRE.cmake b/modules/FindPCRE.cmake
index f0cc940d..b39d8875 100644
--- a/modules/FindPCRE.cmake
+++ b/modules/FindPCRE.cmake
@@ -11,20 +11,20 @@
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-if (PCRE_INCLUDE_DIR AND PCRE_LIBRARIES AND PCRE_PCREPOSIX_LIBRARY AND PCRE_PCRE_LIBRARY)
+if (PCRE_INCLUDE_DIR AND PCRE_PCREPOSIX_LIBRARY AND PCRE_PCRE_LIBRARY)
# Already in cache, be silent
set(PCRE_FIND_QUIETLY TRUE)
-endif (PCRE_INCLUDE_DIR AND PCRE_LIBRARIES AND PCRE_PCREPOSIX_LIBRARY AND PCRE_PCRE_LIBRARY)
+endif (PCRE_INCLUDE_DIR AND PCRE_PCREPOSIX_LIBRARY AND PCRE_PCRE_LIBRARY)
-FIND_PATH(PCRE_INCLUDE_DIR pcre.h )
+FIND_PATH(PCRE_INCLUDE_DIR pcre.h PATH_SUFFIXES pcre)
FIND_LIBRARY(PCRE_PCRE_LIBRARY NAMES pcre)
FIND_LIBRARY(PCRE_PCREPOSIX_LIBRARY NAMES pcreposix)
-set(PCRE_LIBRARIES ${PCRE_PCRE_LIBRARY} ${PCRE_PCREPOSIX_LIBRARY} CACHE STRING "The libraries needed to use PCRE")
-
include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(PCRE DEFAULT_MSG PCRE_INCLUDE_DIR PCRE_LIBRARIES )
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(PCRE DEFAULT_MSG PCRE_INCLUDE_DIR PCRE_PCRE_LIBRARY PCRE_PCREPOSIX_LIBRARY )
+
+set(PCRE_LIBRARIES ${PCRE_PCRE_LIBRARY} ${PCRE_PCREPOSIX_LIBRARY} CACHE STRING "The libraries needed to use PCRE")
MARK_AS_ADVANCED(PCRE_INCLUDE_DIR PCRE_LIBRARIES PCRE_PCREPOSIX_LIBRARY PCRE_PCRE_LIBRARY)
diff --git a/modules/FindRUBY.cmake b/modules/FindRUBY.cmake
index ee44bae2..8696bb49 100644
--- a/modules/FindRUBY.cmake
+++ b/modules/FindRUBY.cmake
@@ -57,7 +57,7 @@ IF(RUBY_EXECUTABLE)
FIND_PATH(RUBY_INCLUDE_PATH
NAMES ruby.h
- PATHS ${RUBY_ARCH_DIR}
+ PATHS ${RUBY_ARCH_DIR} /usr/include/ruby-${RUBY_VERSION}
)
FIND_LIBRARY(RUBY_LIBRARY
diff --git a/modules/FindSharedMimeInfo.cmake b/modules/FindSharedMimeInfo.cmake
index f3ca64cc..e3966b86 100644
--- a/modules/FindSharedMimeInfo.cmake
+++ b/modules/FindSharedMimeInfo.cmake
@@ -10,7 +10,9 @@
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
# the minimum version of shared-mime-database we require
-set(SHARED_MIME_INFO_MINIMUM_VERSION "0.20")
+if (NOT SHARED_MIME_INFO_MINIMUM_VERSION)
+ set(SHARED_MIME_INFO_MINIMUM_VERSION "0.18")
+endif (NOT SHARED_MIME_INFO_MINIMUM_VERSION)
if (UPDATE_MIME_DATABASE_EXECUTABLE)
@@ -37,7 +39,7 @@ else (UPDATE_MIME_DATABASE_EXECUTABLE)
message(STATUS "Found shared-mime-info version: ${smiVersion}")
macro_ensure_version(${SHARED_MIME_INFO_MINIMUM_VERSION} ${smiVersion} _smiVersion_OK)
if (NOT _smiVersion_OK)
- message(STATUS "WARNING: the found version of shared-mime-info (${smiVersion}) is below the minimum required (${SHARED_MIME_INFO_MINIMUM_VERSION})")
+ message(FATAL_ERROR "The found version of shared-mime-info (${smiVersion}) is below the minimum required (${SHARED_MIME_INFO_MINIMUM_VERSION})")
endif (NOT _smiVersion_OK)
endif (NOT SharedMimeInfo_FIND_QUIETLY)
diff --git a/modules/FindSoprano.cmake b/modules/FindSoprano.cmake
index 93e01a01..0cc278b0 100644
--- a/modules/FindSoprano.cmake
+++ b/modules/FindSoprano.cmake
@@ -1,4 +1,18 @@
-
+#
+# Find an installation of Soprano
+#
+# Sets the following variables:
+# Soprano_FOUND - true is Soprano has been found
+# SOPRANO_INCLUDE_DIR - The include directory
+# SOPRANO_LIBRARIES - The Soprano core library to link to (libsoprano)
+# SOPRANO_INDEX_LIBRARIES - The Soprano index library (libsopranoindex)
+# SOPRANO_CLIENT_LIBRARIES - The Soprano client library (libsopranoclient)
+# SOPRANO_SERVER_LIBRARIES - The Soprano server library (libsopranoserver)
+# SOPRANO_VERSION - The Soprano version (string value)
+#
+# Options:
+# Set SOPRANO_MIN_VERSION to set the minimum required Soprano version (default: 1.99)
+#
#if(SOPRANO_INCLUDE_DIR AND SOPRANO_LIBRARIES AND SOPRANO_INDEX_LIBRARIES AND SOPRANO_SERVER_LIBRARIES)
@@ -55,7 +69,6 @@
)
# check for all the libs as required to make sure that we do not try to compile with an old version
- # FIXME: introduce a Soprano version check
if(SOPRANO_INCLUDE_DIR AND SOPRANO_LIBRARIES)
set(Soprano_FOUND TRUE)
@@ -74,15 +87,25 @@
endif(Soprano_FOUND AND SOPRANO_SERVER_LIBRARIES)
# check Soprano version
+
+ # We set a default for the minimum required version to be backwards compatible
+ IF(NOT SOPRANO_MIN_VERSION)
+ SET(SOPRANO_MIN_VERSION "1.99")
+ ENDIF(NOT SOPRANO_MIN_VERSION)
+
if(Soprano_FOUND)
FILE(READ ${SOPRANO_INCLUDE_DIR}/soprano/version.h SOPRANO_VERSION_CONTENT)
STRING(REGEX MATCH "SOPRANO_VERSION_STRING \".*\"\n" SOPRANO_VERSION_MATCH ${SOPRANO_VERSION_CONTENT})
IF (SOPRANO_VERSION_MATCH)
STRING(REGEX REPLACE "SOPRANO_VERSION_STRING \"(.*)\"\n" "\\1" SOPRANO_VERSION ${SOPRANO_VERSION_MATCH})
- if(SOPRANO_VERSION STRLESS "1.99")
+ if(SOPRANO_VERSION STRLESS "${SOPRANO_MIN_VERSION}")
set(Soprano_FOUND FALSE)
- message(FATAL_ERROR "Soprano version ${SOPRANO_VERSION} is too old. Please install 1.99 or newer")
- endif(SOPRANO_VERSION STRLESS "1.99")
+ if(Soprano_FIND_REQUIRED)
+ message(FATAL_ERROR "Soprano version ${SOPRANO_VERSION} is too old. Please install ${SOPRANO_MIN_VERSION} or newer")
+ else(Soprano_FIND_REQUIRED)
+ message(STATUS "Soprano version ${SOPRANO_VERSION} is too old. Please install ${SOPRANO_MIN_VERSION} or newer")
+ endif(Soprano_FIND_REQUIRED)
+ endif(SOPRANO_VERSION STRLESS "${SOPRANO_MIN_VERSION}")
ENDIF (SOPRANO_VERSION_MATCH)
endif(Soprano_FOUND)
diff --git a/modules/FindStrigi.cmake b/modules/FindStrigi.cmake
index b34596e1..5368b318 100644
--- a/modules/FindStrigi.cmake
+++ b/modules/FindStrigi.cmake
@@ -115,7 +115,7 @@ endif (NOT WIN32 AND NOT HAVE_STRIGI_VERSION)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Strigi
- "Couldn't find Strigi streams library. Set the environment variable STRIGI_HOME (or CMAKE_FIND_PREFIX_PATH if using CMake >=2.5) to the strigi install dir."
+ "Couldn't find Strigi streams and streamanalyzer libraries. Set the environment variable STRIGI_HOME (or CMAKE_FIND_PREFIX_PATH if using CMake >=2.5) to the strigi install dir."
STRIGI_STREAMS_LIBRARY STRIGI_STREAMANALYZER_LIBRARY STRIGI_INCLUDE_DIR)
mark_as_advanced(STRIGI_INCLUDE_DIR STRIGI_STREAMANALYZER_LIBRARY STRIGI_STREAMS_LIBRARY STRIGI_STRIGIQTDBUSCLIENT_LIBRARY )
diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake
index 5fdbe82f..193723bc 100644
--- a/modules/FindX11.cmake
+++ b/modules/FindX11.cmake
@@ -415,7 +415,6 @@ IF (UNIX)
X11_Xaccessrules_INCLUDE_PATH
X11_Xaccessstr_INCLUDE_PATH
X11_Xdmcp_INCLUDE_PATH
- X11_xf86misc_INCLUDE_PATH
X11_Xkb_INCLUDE_PATH
X11_Xkblib_INCLUDE_PATH
X11_Xkbfile_INCLUDE_PATH
diff --git a/modules/FindXine.cmake b/modules/FindXine.cmake
new file mode 100644
index 00000000..65777ed8
--- /dev/null
+++ b/modules/FindXine.cmake
@@ -0,0 +1,69 @@
+# - Try to find the XINE library
+# Once done this will define
+#
+# XINE_FOUND - system has the XINE library
+# XINE_VERSION - XINE version
+# XINE_BUGFIX_VERSION - the XINE bugfix version
+# XINE_INCLUDE_DIR - the XINE include directory
+# XINE_LIBRARY - The libraries needed to use XINE
+# XINE_XCB_FOUND - libxine can use XCB for video output
+
+# Copyright (c) 2006,2007 Laurent Montel, <montel@kde.org>
+# Copyright (c) 2006, Matthias Kretz, <kretz@kde.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+if (XINE_INCLUDE_DIR AND XINE_LIBRARY)
+ # Already in cache, be silent
+ set(Xine_FIND_QUIETLY TRUE)
+endif (XINE_INCLUDE_DIR AND XINE_LIBRARY)
+ IF (NOT WIN32)
+ INCLUDE(UsePkgConfig)
+ PKGCONFIG(libxine _LibXineIncDir _LibXineLinkDir _LibXineLinkFlags _LibXineCflags)
+ EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS "--variable=prefix libxine" OUTPUT_VARIABLE _LibXinePrefix)
+ ENDIF (NOT WIN32)
+FIND_PATH(XINE_INCLUDE_DIR NAMES xine.h
+ PATHS
+ ${_LibXineIncDir}
+ NO_DEFAULT_PATH)
+
+FIND_LIBRARY(XINE_LIBRARY NAMES xine
+ PATHS
+ ${_LibXineLinkDir}
+ NO_DEFAULT_PATH
+)
+
+FIND_PROGRAM(XINECONFIG_EXECUTABLE NAMES xine-config PATHS
+ ${_LibXinePrefix}/bin
+)
+
+if (XINE_INCLUDE_DIR AND XINE_LIBRARY AND XINECONFIG_EXECUTABLE)
+ EXEC_PROGRAM(${XINECONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE XINE_VERSION)
+ macro_ensure_version(1.1.1 ${XINE_VERSION} XINE_VERSION_OK)
+ if (XINE_VERSION_OK)
+ set(XINE_FOUND TRUE)
+ string(REGEX REPLACE "[0-9].[0-9]." "" XINE_BUGFIX_VERSION ${XINE_VERSION})
+ endif (XINE_VERSION_OK)
+endif (XINE_INCLUDE_DIR AND XINE_LIBRARY AND XINECONFIG_EXECUTABLE)
+
+INCLUDE(CheckCSourceCompiles)
+SET(CMAKE_REQUIRED_INCLUDES ${XINE_INCLUDE_DIR})
+SET(CMAKE_REQUIRED_LIBRARIES ${XINE_LIBRARY})
+CHECK_C_SOURCE_COMPILES("#include <xine.h>\nint main()\n{\n xine_open_video_driver(xine_new(), \"auto\", XINE_VISUAL_TYPE_XCB, NULL);\n return 0;\n}\n" XINE_XCB_FOUND)
+
+if (XINE_FOUND)
+ if (NOT Xine_FIND_QUIETLY)
+ message(STATUS "Found XINE: ${XINE_LIBRARY}")
+ endif (NOT Xine_FIND_QUIETLY)
+ # if(XINECONFIG_EXECUTABLE)
+ # EXEC_PROGRAM(${XINECONFIG_EXECUTABLE} ARGS --plugindir RETURN_VALUE _return_VALUE OUTPUT_VARIABLE XINEPLUGINSDIR)
+ # MESSAGE(STATUS "XINEPLUGINSDIR :<${XINEPLUGINSDIR}>")
+ # endif(XINECONFIG_EXECUTABLE)
+else (XINE_FOUND)
+ if (Xine_FIND_REQUIRED)
+ message(FATAL_ERROR "Could NOT find XINE 1.1.1 or greater")
+ endif (Xine_FIND_REQUIRED)
+endif (XINE_FOUND)
+
+MARK_AS_ADVANCED(XINE_INCLUDE_DIR XINE_LIBRARY)
diff --git a/modules/KDE4Defaults.cmake b/modules/KDE4Defaults.cmake
index b94eaf6d..d81b265e 100644
--- a/modules/KDE4Defaults.cmake
+++ b/modules/KDE4Defaults.cmake
@@ -27,10 +27,10 @@ set(CMAKE_USE_CHRPATH ON)
# define the generic version of the libraries here
# this makes it easy to advance it when the next KDE release comes
-set(GENERIC_LIB_VERSION "4.0.0")
+set(GENERIC_LIB_VERSION "4.1.0")
set(GENERIC_LIB_SOVERSION "4")
-set(KDE_NON_GENERIC_LIB_VERSION "5.0.0")
+set(KDE_NON_GENERIC_LIB_VERSION "5.1.0")
set(KDE_NON_GENERIC_LIB_SOVERSION "5")
# windows does not support LD_LIBRARY_PATH or similar
diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake
index 247eda79..b449b05e 100644
--- a/modules/KDE4Macros.cmake
+++ b/modules/KDE4Macros.cmake
@@ -19,7 +19,7 @@
# KDE4_REMOVE_OBSOLETE_CMAKE_FILES
# KDE4_NO_ENABLE_FINAL
# KDE4_CREATE_HANDBOOK
-# KDE4_ADD_WIN32_APP_ICON (Use on Win32)
+# KDE4_ADD_APP_ICON
# KDE4_CREATE_MANPAGE
# Copyright (c) 2006, 2007, Alexander Neundorf, <neundorf@kde.org>
@@ -406,7 +406,7 @@ set(_KDE4_ICON_THEME_hi "hicolor")
# only used internally by KDE4_INSTALL_ICONS
-macro (_KDE4_ADD_ICON_INSTALL_RULE _install_SCRIPT _install_PATH _group _orig_NAME _install_NAME)
+macro (_KDE4_ADD_ICON_INSTALL_RULE _install_SCRIPT _install_PATH _group _orig_NAME _install_NAME _l10n_SUBDIR)
# if the string doesn't match the pattern, the result is the full string, so all three have the same content
if (NOT ${_group} STREQUAL ${_install_NAME} )
@@ -414,8 +414,8 @@ macro (_KDE4_ADD_ICON_INSTALL_RULE _install_SCRIPT _install_PATH _group _orig_NA
if(NOT _icon_GROUP)
set(_icon_GROUP "actions")
endif(NOT _icon_GROUP)
-# message(STATUS "icon: ${_current_ICON} size: ${_size} group: ${_group} name: ${_name}" )
- install(FILES ${_orig_NAME} DESTINATION ${_install_PATH}/${_icon_GROUP}/ RENAME ${_install_NAME} )
+# message(STATUS "icon: ${_current_ICON} size: ${_size} group: ${_group} name: ${_name} l10n: ${_l10n_SUBDIR}")
+ install(FILES ${_orig_NAME} DESTINATION ${_install_PATH}/${_icon_GROUP}/${_l10n_SUBDIR}/ RENAME ${_install_NAME} )
endif (NOT ${_group} STREQUAL ${_install_NAME} )
endmacro (_KDE4_ADD_ICON_INSTALL_RULE)
@@ -423,6 +423,14 @@ endmacro (_KDE4_ADD_ICON_INSTALL_RULE)
macro (KDE4_INSTALL_ICONS _defaultpath )
+ # the l10n-subdir if language given as second argument (localized icon)
+ set(_lang ${ARGV1})
+ if(_lang)
+ set(_l10n_SUBDIR l10n/${_lang})
+ else(_lang)
+ set(_l10n_SUBDIR ".")
+ endif(_lang)
+
# first the png icons
file(GLOB _icons *.png)
foreach (_current_ICON ${_icons} )
@@ -435,7 +443,7 @@ macro (KDE4_INSTALL_ICONS _defaultpath )
if( _theme_GROUP)
_KDE4_ADD_ICON_INSTALL_RULE(${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake
${_defaultpath}/${_theme_GROUP}/${_size}x${_size}
- ${_group} ${_current_ICON} ${_name})
+ ${_group} ${_current_ICON} ${_name} ${_l10n_SUBDIR})
endif( _theme_GROUP)
endforeach (_current_ICON)
@@ -451,7 +459,7 @@ macro (KDE4_INSTALL_ICONS _defaultpath )
if( _theme_GROUP)
_KDE4_ADD_ICON_INSTALL_RULE(${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake
${_defaultpath}/${_theme_GROUP}/${_size}x${_size}
- ${_group} ${_current_ICON} ${_name})
+ ${_group} ${_current_ICON} ${_name} ${_l10n_SUBDIR})
endif( _theme_GROUP)
endforeach (_current_ICON)
@@ -466,7 +474,7 @@ macro (KDE4_INSTALL_ICONS _defaultpath )
if( _theme_GROUP)
_KDE4_ADD_ICON_INSTALL_RULE(${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake
${_defaultpath}/${_theme_GROUP}/scalable
- ${_group} ${_current_ICON} ${_name})
+ ${_group} ${_current_ICON} ${_name} ${_l10n_SUBDIR})
endif( _theme_GROUP)
endforeach (_current_ICON)
generated by cgit v1.2.1 (git 2.18.0) at 2025-05-07 17:34:27 +0000