aboutsummaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/CheckPrototypeExists.cmake17
-rw-r--r--modules/FindBZip2.cmake2
-rw-r--r--modules/FindCups.cmake2
-rw-r--r--modules/FindFAM.cmake2
-rw-r--r--modules/FindJasper.cmake2
-rw-r--r--modules/FindKDE4.cmake6
-rw-r--r--modules/FindLibArt.cmake2
-rw-r--r--modules/FindLibXslt.cmake2
-rw-r--r--modules/FindOpenSSL.cmake2
-rw-r--r--modules/FindPCRE.cmake2
-rw-r--r--modules/FindQt4.cmake6
-rw-r--r--modules/KDE4Macros.cmake48
-rw-r--r--modules/UsePkgConfig.cmake2
13 files changed, 57 insertions, 38 deletions
diff --git a/modules/CheckPrototypeExists.cmake b/modules/CheckPrototypeExists.cmake
index 4797865f..38d9d6ba 100644
--- a/modules/CheckPrototypeExists.cmake
+++ b/modules/CheckPrototypeExists.cmake
@@ -6,11 +6,20 @@
# VARIABLE - variable to store the result
#
-INCLUDE(CheckTypeSize)
+INCLUDE(CheckCXXSourceCompiles)
MACRO(CHECK_PROTOTYPE_EXISTS _SYMBOL _HEADER _RESULT)
- SET(CMAKE_EXTRA_INCLUDE_FILES ${_HEADER})
- CHECK_TYPE_SIZE(${_SYMBOL} ${_RESULT})
- SET(CMAKE_EXTRA_INCLUDE_FILES)
+ SET(_CHECK_PROTO_EXISTS_SOURCE_CODE "
+#include <${_HEADER}>
+void cmakeRequireSymbol(int dummy,...){(void)dummy;}
+int main()
+{
+#ifndef ${_SYMBOL}
+ cmakeRequireSymbol(0,&${_SYMBOL});
+#endif
+ return 0;
+}
+")
+ CHECK_CXX_SOURCE_COMPILES("${_CHECK_PROTO_EXISTS_SOURCE_CODE}" ${_RESULT})
ENDMACRO(CHECK_PROTOTYPE_EXISTS _SYMBOL _HEADER _RESULT)
diff --git a/modules/FindBZip2.cmake b/modules/FindBZip2.cmake
index cc248ad1..cbf9b25a 100644
--- a/modules/FindBZip2.cmake
+++ b/modules/FindBZip2.cmake
@@ -32,7 +32,7 @@ IF(BZIP2_FOUND)
ENDIF(NOT BZip2_FIND_QUIETLY)
ELSE(BZIP2_FOUND)
IF(BZip2_FIND_REQUIRED)
- MESSAGE(SEND_ERROR "Could not find BZip2")
+ MESSAGE(FATAL_ERROR "Could not find BZip2")
ENDIF(BZip2_FIND_REQUIRED)
ENDIF(BZIP2_FOUND)
diff --git a/modules/FindCups.cmake b/modules/FindCups.cmake
index f0518f68..3fa26686 100644
--- a/modules/FindCups.cmake
+++ b/modules/FindCups.cmake
@@ -29,7 +29,7 @@ IF(CUPS_FOUND)
ENDIF(NOT Cups_FIND_QUIETLY)
ELSE(CUPS_FOUND)
IF(Cups_FIND_REQUIRED)
- MESSAGE(SEND_ERROR "Could not find Cups")
+ MESSAGE(FATAL_ERROR "Could not find Cups")
ENDIF(Cups_FIND_REQUIRED)
ENDIF(CUPS_FOUND)
diff --git a/modules/FindFAM.cmake b/modules/FindFAM.cmake
index 1ac64251..bfc553fe 100644
--- a/modules/FindFAM.cmake
+++ b/modules/FindFAM.cmake
@@ -22,6 +22,6 @@ IF(FAM_FOUND)
ENDIF(NOT FAM_FIND_QUIETLY)
ELSE(FAM_FOUND)
IF(FAM_FIND_REQUIRED)
- MESSAGE(SEND_ERROR "Could not find fam library")
+ MESSAGE(FATAL_ERROR "Could not find fam library")
ENDIF(FAM_FIND_REQUIRED)
ENDIF(FAM_FOUND)
diff --git a/modules/FindJasper.cmake b/modules/FindJasper.cmake
index 87bdb70d..447d309b 100644
--- a/modules/FindJasper.cmake
+++ b/modules/FindJasper.cmake
@@ -22,6 +22,6 @@ IF(JASPER_FOUND)
ENDIF(NOT Jasper_FIND_QUIETLY)
ELSE(JASPER_FOUND)
IF(Jasper_FIND_REQUIRED)
- MESSAGE(SEND_ERROR "Could not find jasper library")
+ MESSAGE(FATAL_ERROR "Could not find jasper library")
ENDIF(Jasper_FIND_REQUIRED)
ENDIF(JASPER_FOUND)
diff --git a/modules/FindKDE4.cmake b/modules/FindKDE4.cmake
index 8553ef9f..012c9a10 100644
--- a/modules/FindKDE4.cmake
+++ b/modules/FindKDE4.cmake
@@ -29,12 +29,12 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.2)
IF(UNIX)
IF(APPLE)
- MESSAGE(SEND_ERROR "Mac OSX not yet supported by FindKDE4.cmake and KDE4Macros.cmake, please edit them as required")
+ MESSAGE(FATAL_ERROR "Mac OSX not yet supported by FindKDE4.cmake and KDE4Macros.cmake, please edit them as required")
ELSE(APPLE)
FIND_PACKAGE(X11 REQUIRED)
ENDIF(APPLE)
ELSE(UNIX)
- MESSAGE(SEND_ERROR "Win32 not yet supported by FindKDE4.cmake and KDE4Macros.cmake, please edit them as required")
+ MESSAGE(FATAL_ERROR "Win32 not yet supported by FindKDE4.cmake and KDE4Macros.cmake, please edit them as required")
ENDIF(UNIX)
#this line includes FindQt.cmake, which searches the Qt library and headers
@@ -56,7 +56,7 @@ IF(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
SET(CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -avoid-version -Wl,--no-undefined -lc")
SET(CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -avoid-version -Wl,--no-undefined -lc")
SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -O2 -Wformat-security -Wmissing-format-attribute -fno-common")
- SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -O2 -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common")
+ SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -O2 -Wformat-security -fno-exceptions -fno-check-new -fno-common")
ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
IF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
diff --git a/modules/FindLibArt.cmake b/modules/FindLibArt.cmake
index 3a716fef..35b349fc 100644
--- a/modules/FindLibArt.cmake
+++ b/modules/FindLibArt.cmake
@@ -31,6 +31,6 @@ IF(LIBART_FOUND)
ENDIF(NOT LibArt_FIND_QUIETLY)
ELSE(LIBART_FOUND)
IF(LibArt_FIND_REQUIRED)
- MESSAGE(SEND_ERROR "Could not find libart")
+ MESSAGE(FATAL_ERROR "Could not find libart")
ENDIF(LibArt_FIND_REQUIRED)
ENDIF(LIBART_FOUND)
diff --git a/modules/FindLibXslt.cmake b/modules/FindLibXslt.cmake
index f8007ce0..3d0dc525 100644
--- a/modules/FindLibXslt.cmake
+++ b/modules/FindLibXslt.cmake
@@ -39,7 +39,7 @@ IF(LIBXSLT_FOUND)
ENDIF(NOT LibXslt_FIND_QUIETLY)
ELSE(LIBXSLT_FOUND)
IF(LibXslt_FIND_REQUIRED)
- MESSAGE(SEND_ERROR "Could not find LibXslt")
+ MESSAGE(FATAL_ERROR "Could not find LibXslt")
ENDIF(LibXslt_FIND_REQUIRED)
ENDIF(LIBXSLT_FOUND)
diff --git a/modules/FindOpenSSL.cmake b/modules/FindOpenSSL.cmake
index 1b13d63f..f07908a0 100644
--- a/modules/FindOpenSSL.cmake
+++ b/modules/FindOpenSSL.cmake
@@ -21,6 +21,6 @@ IF(OPENSSL_FOUND)
ENDIF(NOT OpenSSL_FIND_QUIETLY)
ELSE(OPENSSL_FOUND)
IF(OpenSSL_FIND_REQUIRED)
- MESSAGE(SEND_ERROR "Could not find OpenSSL")
+ MESSAGE(FATAL_ERROR "Could not find OpenSSL")
ENDIF(OpenSSL_FIND_REQUIRED)
ENDIF(OPENSSL_FOUND)
diff --git a/modules/FindPCRE.cmake b/modules/FindPCRE.cmake
index 350cced8..fa61a430 100644
--- a/modules/FindPCRE.cmake
+++ b/modules/FindPCRE.cmake
@@ -29,6 +29,6 @@ IF(PCRE_FOUND)
ENDIF(NOT PCRE_FIND_QUIETLY)
ELSE(PCRE_FOUND)
IF(PCRE_FIND_REQUIRED)
- MESSAGE(SEND_ERROR "Could not find PCRE")
+ MESSAGE(FATAL_ERROR "Could not find PCRE")
ENDIF(PCRE_FIND_REQUIRED)
ENDIF(PCRE_FOUND)
diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake
index 9b7bb1dd..466ccb37 100644
--- a/modules/FindQt4.cmake
+++ b/modules/FindQt4.cmake
@@ -211,7 +211,7 @@ IF(QT4_QMAKE_FOUND)
ENDIF( QT_QT_INCLUDE_DIR AND NOT QT_INCLUDE_DIR)
IF( NOT QT_INCLUDE_DIR)
IF( NOT Qt4_FIND_QUIETLY AND Qt4_FIND_REQUIRED)
- MESSAGE( SEND_ERROR "Could not find qglobal.h")
+ MESSAGE( FATAL_ERROR "Could not find qglobal.h")
ENDIF( NOT Qt4_FIND_QUIETLY AND Qt4_FIND_REQUIRED)
ENDIF( NOT QT_INCLUDE_DIR)
@@ -741,7 +741,7 @@ IF(QT4_QMAKE_FOUND)
ELSE( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE)
SET( QT4_FOUND "NO")
IF( Qt4_FIND_REQUIRED)
- MESSAGE( SEND_ERROR "Qt libraries, includes, moc, uic or/and rcc NOT found!")
+ MESSAGE( FATAL_ERROR "Qt libraries, includes, moc, uic or/and rcc NOT found!")
ENDIF( Qt4_FIND_REQUIRED)
ENDIF( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE)
SET(QT_FOUND ${QT4_FOUND})
@@ -776,7 +776,7 @@ ELSE(QT4_QMAKE_FOUND)
MESSAGE("QT_QMAKE_EXECUTABLE set to qmake version: QTVERSION = ${QTVERSION}\nQT_QMAKE_EXECUTABLE = ${QT_QMAKE_EXECUTABLE}, please set to path to qmake from qt4.")
ENDIF(QT_QMAKE_EXECUTABLE)
IF( Qt4_FIND_REQUIRED)
- MESSAGE( SEND_ERROR "Qt qmake not found!")
+ MESSAGE( FATAL_ERROR "Qt qmake not found!")
ENDIF( Qt4_FIND_REQUIRED)
ENDIF(QT4_QMAKE_FOUND)
diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake
index 376e6a38..f5632c8a 100644
--- a/modules/KDE4Macros.cmake
+++ b/modules/KDE4Macros.cmake
@@ -54,8 +54,6 @@ MACRO(KDE4_ADD_DCOP_SKELS _sources)
)
ENDIF (NOT HAVE_${_basename}_KIDL_RULE)
-
-
IF (NOT HAVE_${_basename}_SKEL_RULE)
SET(HAVE_${_basename}_SKEL_RULE ON)
@@ -92,7 +90,7 @@ MACRO(KDE4_ADD_DCOP_STUBS _sources)
COMMAND ${KDE4_DCOPIDL_EXECUTABLE}
ARGS --srcdir ${KDE4_KALYPTUS_DIR} ${_tmp_FILE} > ${_kidl}
DEPENDS ${_tmp_FILE}
- )
+ )
ENDIF (NOT HAVE_${_basename}_KIDL_RULE)
IF (NOT HAVE_${_basename}_STUB_RULE)
@@ -153,6 +151,12 @@ ENDMACRO(KDE4_ADD_KCFG_FILES)
# ENDFOREACH (_current_FILE)
#ENDMACRO(KDE4_ADD_MOC_FILES)
+IF(EXISTS "${CMAKE_ROOT}/Modules/kde4init_dummy.cpp.in")
+ SET(KDE4_MODULE_DIR "${CMAKE_ROOT}/Modules")
+ELSE(EXISTS "${CMAKE_ROOT}/Modules/kde4init_dummy.cpp.in")
+ SET(KDE4_MODULE_DIR "${CMAKE_SOURCE_DIR}/cmake/modules")
+ENDIF(EXISTS "${CMAKE_ROOT}/Modules/kde4init_dummy.cpp.in")
+
#create the implementation files from the ui files and add them to the list of sources
#usage: KDE_ADD_UI_FILES(foo_SRCS ${ui_files})
@@ -174,7 +178,7 @@ MACRO(KDE4_ADD_UI_FILES _sources )
-DKDE_UIC_FILE:FILEPATH=${_tmp_FILE}
-DKDE_UIC_H_FILE:FILEPATH=${_header}
-DKDE_UIC_BASENAME:STRING=${_basename}
- -P ${CMAKE_ROOT}/Modules/kde4uic.cmake
+ -P ${KDE4_MODULE_DIR}/kde4uic.cmake
DEPENDS ${_tmp_FILE}
)
ENDFOREACH (_current_FILE)
@@ -209,7 +213,7 @@ MACRO(KDE4_ADD_UI3_FILES _sources )
-DKDE_UIC_H_FILE:FILEPATH=${_header}
-DKDE_UIC_BASENAME:STRING=${_basename}
-DKDE_UIC_PLUGIN_DIR:FILEPATH="."
- -P ${CMAKE_ROOT}/Modules/kde4uic.cmake
+ -P ${KDE4_MODULE_DIR}/kde4uic.cmake
DEPENDS ${_tmp_FILE}
)
@@ -225,7 +229,7 @@ MACRO(KDE4_ADD_UI3_FILES _sources )
-DKDE_UIC_H_FILE:FILEPATH=${_header}
-DKDE_UIC_BASENAME:STRING=${_basename}
-DKDE_UIC_PLUGIN_DIR:FILEPATH="."
- -P ${CMAKE_ROOT}/Modules/kde4uic.cmake
+ -P ${KDE4_MODULE_DIR}/kde4uic.cmake
DEPENDS ${_header}
)
@@ -357,13 +361,19 @@ MACRO(KDE4_CREATE_LIBTOOL_FILE _target)
ENDMACRO(KDE4_CREATE_LIBTOOL_FILE)
-MACRO(KDE4_CREATE_FINAL_FILE _filename)
- FILE(WRITE ${_filename} "//autogenerated file\n")
+MACRO(KDE4_CREATE_FINAL_FILES _filenameCPP _filenameC )
+ FILE(WRITE ${_filenameCPP} "//autogenerated file\n")
+ FILE(WRITE ${_filenameC} "/*autogenerated file*/\n")
FOREACH (_current_FILE ${ARGN})
- FILE(APPEND ${_filename} "#include \"${_current_FILE}\"\n")
+ STRING(REGEX MATCH ".+\\.c$" _isCFile ${_current_FILE})
+ IF(_isCFile)
+ FILE(APPEND ${_filenameC} "#include \"${_current_FILE}\"\n")
+ ELSE(_isCFile)
+ FILE(APPEND ${_filenameCPP} "#include \"${_current_FILE}\"\n")
+ ENDIF(_isCFile)
ENDFOREACH (_current_FILE)
-ENDMACRO(KDE4_CREATE_FINAL_FILE _filename)
+ENDMACRO(KDE4_CREATE_FINAL_FILES)
OPTION(KDE4_ENABLE_FINAL "Enable final all-in-one compilation")
@@ -378,8 +388,8 @@ MACRO(KDE4_ADD_PLUGIN _target_NAME _with_PREFIX)
ENDIF (${_with_PREFIX} STREQUAL "WITH_PREFIX")
IF (KDE4_ENABLE_FINAL)
- KDE4_CREATE_FINAL_FILE(${_target_NAME}_final.cpp ${_first_SRC} ${ARGN})
- ADD_LIBRARY(${_target_NAME} MODULE ${_target_NAME}_final.cpp)
+ KDE4_CREATE_FINAL_FILES(${_target_NAME}_final_cpp.cpp ${_target_NAME}_final_c.c ${_first_SRC} ${ARGN})
+ ADD_LIBRARY(${_target_NAME} MODULE ${_target_NAME}_final_cpp.cpp ${_target_NAME}_final_c.c)
ELSE (KDE4_ENABLE_FINAL)
ADD_LIBRARY(${_target_NAME} MODULE ${_first_SRC} ${ARGN})
ENDIF (KDE4_ENABLE_FINAL)
@@ -395,14 +405,14 @@ ENDMACRO(KDE4_ADD_PLUGIN _target_NAME _with_PREFIX)
MACRO(KDE4_ADD_KLM _target_NAME )
IF (KDE4_ENABLE_FINAL)
- KDE4_CREATE_FINAL_FILE(${_target_NAME}_final.cpp ${ARGN})
- ADD_LIBRARY(kdeinit_${_target_NAME} SHARED ${_target_NAME}_final.cpp)
+ KDE4_CREATE_FINAL_FILES(${_target_NAME}_final_cpp.cpp ${_target_NAME}_final_c.c ${ARGN})
+ ADD_LIBRARY(kdeinit_${_target_NAME} SHARED ${_target_NAME}_final_cpp.cpp ${_target_NAME}_final_c.c)
ELSE (KDE4_ENABLE_FINAL)
ADD_LIBRARY(kdeinit_${_target_NAME} SHARED ${ARGN} )
# MESSAGE(STATUS "klm: kdeinit_${_target_NAME}")
ENDIF (KDE4_ENABLE_FINAL)
- CONFIGURE_FILE(${CMAKE_ROOT}/Modules/kde4init_dummy.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp)
+ CONFIGURE_FILE(${KDE4_MODULE_DIR}/kde4init_dummy.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp)
ADD_EXECUTABLE( ${_target_NAME} ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp )
TARGET_LINK_LIBRARIES( ${_target_NAME} kdeinit_${_target_NAME} )
@@ -413,8 +423,8 @@ ENDMACRO(KDE4_ADD_KLM _target_NAME)
MACRO(KDE4_ADD_EXECUTABLE _target_NAME )
IF (KDE4_ENABLE_FINAL)
- KDE4_CREATE_FINAL_FILE(${_target_NAME}_final.cpp ${ARGN})
- ADD_EXECUTABLE(${_target_NAME} ${_target_NAME}_final.cpp)
+ KDE4_CREATE_FINAL_FILES(${_target_NAME}_final_cpp.cpp ${_target_NAME}_final_c.c ${ARGN})
+ ADD_EXECUTABLE(${_target_NAME} ${_target_NAME}_final_cpp.cpp ${_target_NAME}_final_c.c)
ELSE (KDE4_ENABLE_FINAL)
ADD_EXECUTABLE(${_target_NAME} ${ARGN} )
ENDIF (KDE4_ENABLE_FINAL)
@@ -441,8 +451,8 @@ MACRO(KDE4_ADD_LIBRARY _target_NAME _lib_TYPE)
ENDIF (${_lib_TYPE} STREQUAL "MODULE")
IF (KDE4_ENABLE_FINAL)
- KDE4_CREATE_FINAL_FILE(${_target_NAME}_final.cpp ${_first_SRC} ${ARGN})
- ADD_LIBRARY(${_target_NAME} ${_add_lib_param} ${_target_NAME}_final.cpp)
+ KDE4_CREATE_FINAL_FILES(${_target_NAME}_final_cpp.cpp ${_target_NAME}_final_c.c ${_first_SRC} ${ARGN})
+ ADD_LIBRARY(${_target_NAME} ${_add_lib_param} ${_target_NAME}_final_cpp.cpp ${_target_NAME}_final_c.c)
ELSE (KDE4_ENABLE_FINAL)
ADD_LIBRARY(${_target_NAME} ${_add_lib_param} ${_first_SRC} ${ARGN})
ENDIF (KDE4_ENABLE_FINAL)
diff --git a/modules/UsePkgConfig.cmake b/modules/UsePkgConfig.cmake
index 7dc74777..898fb706 100644
--- a/modules/UsePkgConfig.cmake
+++ b/modules/UsePkgConfig.cmake
@@ -18,7 +18,7 @@ MACRO(PKGCONFIG _package _include_DIR _link_DIR _link_FLAGS _cflags)
# if pkg-config has been found
IF(PKGCONFIG_EXECUTABLE)
- EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --exists RETURN_VALUE _return_VALUE )
+ EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --exists RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull )
# and if the package of interest also exists for pkg-config, then get the information
IF(NOT _return_VALUE)
generated by cgit v1.2.1 (git 2.18.0) at 2025-10-31 12:29:42 +0000