From c383c791ece6f71742632157919805506e1e74af Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Sat, 9 Jun 2007 12:11:33 +0000 Subject: This module allows to test if we installed depends package. For some cmake module it is not necessary to move them into kdelibs as FindLibKDEgames which is necessary by playground/games which failed if we didn t install kdegames before. Not it signaled that it depend under other modules. svn path=/trunk/KDE/kdelibs/; revision=673217 --- modules/MacroOptionalDependPackage.cmake | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 modules/MacroOptionalDependPackage.cmake (limited to 'modules/MacroOptionalDependPackage.cmake') diff --git a/modules/MacroOptionalDependPackage.cmake b/modules/MacroOptionalDependPackage.cmake new file mode 100644 index 00000000..1a6df36a --- /dev/null +++ b/modules/MacroOptionalDependPackage.cmake @@ -0,0 +1,22 @@ +# Search if cmake module is installed in computer +# cmake will not fail but signal that we must install depend package before. +# add as previously name of cmake module "_name" and define package needed "_module_needed" +# if return DEPEND_PACKAGE_${_name} + +# Copyright (c) 2007, Montel Laurent +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + + +MACRO (MACRO_OPTIONAL_DEPEND_PACKAGE _name _module_needed) + set(_packagename Find${_name}.cmake) + find_file(_PACKAGE_DEPEND_FOUND ${_packagename} PATHS ${CMAKE_MODULE_PATH} ) + if(NOT _PACKAGE_DEPEND_FOUND) + MESSAGE(STATUS "cmake package ${_packagename} was not found. This package needs ${_module_needed} to be compile all program") + set(DEPEND_PACKAGE_${_name} FALSE) + else(NOT _PACKAGE_DEPEND_FOUND) + set(DEPEND_PACKAGE_${_name} TRUE) + endif(NOT _PACKAGE_DEPEND_FOUND) +ENDMACRO (MACRO_OPTIONAL_DEPEND_PACKAGE) + -- cgit v1.2.1 From c39c2245fe6429e2749a2a9d94d0cbf30b50f7ab Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 29 Aug 2008 10:38:09 +0000 Subject: merge 850650 here svn path=/trunk/KDE/kdelibs/; revision=854302 --- modules/MacroOptionalDependPackage.cmake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'modules/MacroOptionalDependPackage.cmake') diff --git a/modules/MacroOptionalDependPackage.cmake b/modules/MacroOptionalDependPackage.cmake index 1a6df36a..fd82b567 100644 --- a/modules/MacroOptionalDependPackage.cmake +++ b/modules/MacroOptionalDependPackage.cmake @@ -13,10 +13,11 @@ MACRO (MACRO_OPTIONAL_DEPEND_PACKAGE _name _module_needed) set(_packagename Find${_name}.cmake) find_file(_PACKAGE_DEPEND_FOUND ${_packagename} PATHS ${CMAKE_MODULE_PATH} ) if(NOT _PACKAGE_DEPEND_FOUND) - MESSAGE(STATUS "cmake package ${_packagename} was not found. This package needs ${_module_needed} to be compile all program") - set(DEPEND_PACKAGE_${_name} FALSE) + MESSAGE(STATUS "cmake package ${_packagename} not found, optional dependency ${_module_needed}") + set(DEPEND_PACKAGE_${_name} FALSE) else(NOT _PACKAGE_DEPEND_FOUND) - set(DEPEND_PACKAGE_${_name} TRUE) + set(DEPEND_PACKAGE_${_name} TRUE) endif(NOT _PACKAGE_DEPEND_FOUND) + macro_log_feature(_PACKAGE_DEPEND_FOUND "${_packagename}" "${_module_needed}" "" FALSE "" "Optional dependency") ENDMACRO (MACRO_OPTIONAL_DEPEND_PACKAGE) -- cgit v1.2.1 From 9c72dc264f879ad796dfbf5721abed50e9367410 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 29 Aug 2008 10:38:55 +0000 Subject: not supposed to be committed svn path=/trunk/KDE/kdelibs/; revision=854303 --- modules/MacroOptionalDependPackage.cmake | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'modules/MacroOptionalDependPackage.cmake') diff --git a/modules/MacroOptionalDependPackage.cmake b/modules/MacroOptionalDependPackage.cmake index fd82b567..1a6df36a 100644 --- a/modules/MacroOptionalDependPackage.cmake +++ b/modules/MacroOptionalDependPackage.cmake @@ -13,11 +13,10 @@ MACRO (MACRO_OPTIONAL_DEPEND_PACKAGE _name _module_needed) set(_packagename Find${_name}.cmake) find_file(_PACKAGE_DEPEND_FOUND ${_packagename} PATHS ${CMAKE_MODULE_PATH} ) if(NOT _PACKAGE_DEPEND_FOUND) - MESSAGE(STATUS "cmake package ${_packagename} not found, optional dependency ${_module_needed}") - set(DEPEND_PACKAGE_${_name} FALSE) + MESSAGE(STATUS "cmake package ${_packagename} was not found. This package needs ${_module_needed} to be compile all program") + set(DEPEND_PACKAGE_${_name} FALSE) else(NOT _PACKAGE_DEPEND_FOUND) - set(DEPEND_PACKAGE_${_name} TRUE) + set(DEPEND_PACKAGE_${_name} TRUE) endif(NOT _PACKAGE_DEPEND_FOUND) - macro_log_feature(_PACKAGE_DEPEND_FOUND "${_packagename}" "${_module_needed}" "" FALSE "" "Optional dependency") ENDMACRO (MACRO_OPTIONAL_DEPEND_PACKAGE) -- cgit v1.2.1 From 8660472cecf9357344f601a40a8e7c6f5608dc0a Mon Sep 17 00:00:00 2001 From: David Faure Date: Mon, 9 Mar 2009 14:43:33 +0000 Subject: Improve the sentence svn path=/trunk/KDE/kdelibs/; revision=937330 --- modules/MacroOptionalDependPackage.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'modules/MacroOptionalDependPackage.cmake') diff --git a/modules/MacroOptionalDependPackage.cmake b/modules/MacroOptionalDependPackage.cmake index 1a6df36a..bc7b671b 100644 --- a/modules/MacroOptionalDependPackage.cmake +++ b/modules/MacroOptionalDependPackage.cmake @@ -13,10 +13,10 @@ MACRO (MACRO_OPTIONAL_DEPEND_PACKAGE _name _module_needed) set(_packagename Find${_name}.cmake) find_file(_PACKAGE_DEPEND_FOUND ${_packagename} PATHS ${CMAKE_MODULE_PATH} ) if(NOT _PACKAGE_DEPEND_FOUND) - MESSAGE(STATUS "cmake package ${_packagename} was not found. This package needs ${_module_needed} to be compile all program") - set(DEPEND_PACKAGE_${_name} FALSE) + MESSAGE(STATUS "optional cmake package ${_packagename} (for ${_module_needed}) was not found.") + set(DEPEND_PACKAGE_${_name} FALSE) else(NOT _PACKAGE_DEPEND_FOUND) - set(DEPEND_PACKAGE_${_name} TRUE) + set(DEPEND_PACKAGE_${_name} TRUE) endif(NOT _PACKAGE_DEPEND_FOUND) ENDMACRO (MACRO_OPTIONAL_DEPEND_PACKAGE) -- cgit v1.2.1 From f6e82e2a458de0aefbde9499f042127e9368e3ec Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Fri, 19 Mar 2010 18:05:31 +0000 Subject: -all lower-case Alex svn path=/trunk/KDE/kdelibs/; revision=1105272 --- modules/MacroOptionalDependPackage.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'modules/MacroOptionalDependPackage.cmake') diff --git a/modules/MacroOptionalDependPackage.cmake b/modules/MacroOptionalDependPackage.cmake index bc7b671b..2ea79960 100644 --- a/modules/MacroOptionalDependPackage.cmake +++ b/modules/MacroOptionalDependPackage.cmake @@ -9,14 +9,14 @@ # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -MACRO (MACRO_OPTIONAL_DEPEND_PACKAGE _name _module_needed) +macro (MACRO_OPTIONAL_DEPEND_PACKAGE _name _module_needed) set(_packagename Find${_name}.cmake) find_file(_PACKAGE_DEPEND_FOUND ${_packagename} PATHS ${CMAKE_MODULE_PATH} ) if(NOT _PACKAGE_DEPEND_FOUND) - MESSAGE(STATUS "optional cmake package ${_packagename} (for ${_module_needed}) was not found.") + message(STATUS "optional cmake package ${_packagename} (for ${_module_needed}) was not found.") set(DEPEND_PACKAGE_${_name} FALSE) else(NOT _PACKAGE_DEPEND_FOUND) set(DEPEND_PACKAGE_${_name} TRUE) endif(NOT _PACKAGE_DEPEND_FOUND) -ENDMACRO (MACRO_OPTIONAL_DEPEND_PACKAGE) +endmacro (MACRO_OPTIONAL_DEPEND_PACKAGE) -- cgit v1.2.1