From 57ce7d92db2864165cba6c1480e7c24ecabe9d3f Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Sun, 1 Jul 2012 06:25:31 +0000 Subject: [PATCH] Let it build with cmake 2.8.1 and older. SVN revision: 73087 --- legacy/eobj/cmake/Modules/FindCheck.cmake | 6 +++++- legacy/eobj/cmake/Modules/FindEcore.cmake | 8 ++++++-- legacy/eobj/cmake/Modules/FindEdje.cmake | 6 +++++- legacy/eobj/cmake/Modules/FindEet.cmake | 6 +++++- legacy/eobj/cmake/Modules/FindEfreet.cmake | 6 +++++- legacy/eobj/cmake/Modules/FindEina.cmake | 6 +++++- legacy/eobj/cmake/Modules/FindElementary.cmake | 6 +++++- legacy/eobj/cmake/Modules/FindEvas.cmake | 6 +++++- 8 files changed, 41 insertions(+), 9 deletions(-) diff --git a/legacy/eobj/cmake/Modules/FindCheck.cmake b/legacy/eobj/cmake/Modules/FindCheck.cmake index 795b61554f..13ed8e9ebe 100644 --- a/legacy/eobj/cmake/Modules/FindCheck.cmake +++ b/legacy/eobj/cmake/Modules/FindCheck.cmake @@ -6,7 +6,11 @@ # CHECK_DEFINITIONS - Compiler switches required for using check find_package(PkgConfig) -pkg_check_modules(PC_LIBCHECK QUIET check) +if ("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER "2.8.1") + # "QUIET" was introduced in 2.8.2 + set(_QUIET QUIET) +endif () +pkg_check_modules(PC_LIBCHECK ${_QUIET} check) set(CHECK_DEFINITIONS ${PC_LIBCHECK_CFLAGS_OTHER}) find_path(CHECK_INCLUDE_DIR check.h diff --git a/legacy/eobj/cmake/Modules/FindEcore.cmake b/legacy/eobj/cmake/Modules/FindEcore.cmake index 97783472b3..25368cb7f0 100644 --- a/legacy/eobj/cmake/Modules/FindEcore.cmake +++ b/legacy/eobj/cmake/Modules/FindEcore.cmake @@ -14,7 +14,11 @@ IF( Ecore_FIND_COMPONENTS ) ENDIF( Ecore_FIND_COMPONENTS ) find_package(PkgConfig) -pkg_check_modules(PC_LIBECORE QUIET ecore) +if ("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER "2.8.1") + # "QUIET" was introduced in 2.8.2 + set(_QUIET QUIET) +endif () +pkg_check_modules(PC_LIBECORE ${_QUIET} ecore) set(ECORE_DEFINITIONS ${PC_LIBECORE_CFLAGS_OTHER}) find_path(ECORE_INCLUDE_DIR Ecore.h @@ -36,7 +40,7 @@ find_package_handle_standard_args(ecore DEFAULT_MSG mark_as_advanced( ECORE_INCLUDE_DIR ECORE_LIBRARY ) if (ECORE_USE_ECORE-X) - pkg_check_modules(PC_LIBECORE_X QUIET ecore-x) + pkg_check_modules(PC_LIBECORE_X ${_QUIET} ecore-x) set(ECORE_X_DEFINITIONS ${PC_LIBECORE_X_CFLAGS_OTHER}) find_path(ECORE_X_INCLUDE_DIR Ecore_X.h diff --git a/legacy/eobj/cmake/Modules/FindEdje.cmake b/legacy/eobj/cmake/Modules/FindEdje.cmake index 927b31d5f1..3e58d79055 100644 --- a/legacy/eobj/cmake/Modules/FindEdje.cmake +++ b/legacy/eobj/cmake/Modules/FindEdje.cmake @@ -6,7 +6,11 @@ # EDJE_DEFINITIONS - Compiler switches required for using edje find_package(PkgConfig) -pkg_check_modules(PC_LIBEDJE QUIET edje) +if ("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER "2.8.1") + # "QUIET" was introduced in 2.8.2 + set(_QUIET QUIET) +endif () +pkg_check_modules(PC_LIBEDJE ${_QUIET} edje) set(EDJE_DEFINITIONS ${PC_LIBEDJE_CFLAGS_OTHER}) find_path(EDJE_INCLUDE_DIR Edje.h diff --git a/legacy/eobj/cmake/Modules/FindEet.cmake b/legacy/eobj/cmake/Modules/FindEet.cmake index ae215d330c..c749883086 100644 --- a/legacy/eobj/cmake/Modules/FindEet.cmake +++ b/legacy/eobj/cmake/Modules/FindEet.cmake @@ -6,7 +6,11 @@ # EET_DEFINITIONS - Compiler switches required for using eet find_package(PkgConfig) -pkg_check_modules(PC_LIBEET QUIET eet) +if ("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER "2.8.1") + # "QUIET" was introduced in 2.8.2 + set(_QUIET QUIET) +endif () +pkg_check_modules(PC_LIBEET ${_QUIET} eet) set(EET_DEFINITIONS ${PC_LIBEET_CFLAGS_OTHER}) find_path(EET_INCLUDE_DIR Eet.h diff --git a/legacy/eobj/cmake/Modules/FindEfreet.cmake b/legacy/eobj/cmake/Modules/FindEfreet.cmake index d245206f11..0ec86373e7 100644 --- a/legacy/eobj/cmake/Modules/FindEfreet.cmake +++ b/legacy/eobj/cmake/Modules/FindEfreet.cmake @@ -6,7 +6,11 @@ # EFREET_DEFINITIONS - Compiler switches required for using efreet find_package(PkgConfig) -pkg_check_modules(PC_LIBEFREET QUIET efreet) +if ("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER "2.8.1") + # "QUIET" was introduced in 2.8.2 + set(_QUIET QUIET) +endif () +pkg_check_modules(PC_LIBEFREET ${_QUIET} efreet) set(EFREET_DEFINITIONS ${PC_LIBEFREET_CFLAGS_OTHER}) find_path(EFREET_INCLUDE_DIR Efreet.h diff --git a/legacy/eobj/cmake/Modules/FindEina.cmake b/legacy/eobj/cmake/Modules/FindEina.cmake index efc47e6607..6debf909f7 100644 --- a/legacy/eobj/cmake/Modules/FindEina.cmake +++ b/legacy/eobj/cmake/Modules/FindEina.cmake @@ -7,7 +7,11 @@ # EINA_DEFINITIONS - Compiler switches required for using eina find_package(PkgConfig) -pkg_check_modules(PC_LIBEINA QUIET eina) +if ("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER "2.8.1") + # "QUIET" was introduced in 2.8.2 + set(_QUIET QUIET) +endif () +pkg_check_modules(PC_LIBEINA ${_QUIET} eina) set(EINA_DEFINITIONS ${PC_LIBEINA_CFLAGS_OTHER}) set(EINA_LDFLAGS_OTHER ${PC_LIBEINA_LDFLAGS_OTHER}) diff --git a/legacy/eobj/cmake/Modules/FindElementary.cmake b/legacy/eobj/cmake/Modules/FindElementary.cmake index 5b75bfcedd..5b09da09c0 100644 --- a/legacy/eobj/cmake/Modules/FindElementary.cmake +++ b/legacy/eobj/cmake/Modules/FindElementary.cmake @@ -6,7 +6,11 @@ # ELEMENTARY_DEFINITIONS - Compiler switches required for using elementary find_package(PkgConfig) -pkg_check_modules(PC_LIBELEMENTARY QUIET elementary) +if ("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER "2.8.1") + # "QUIET" was introduced in 2.8.2 + set(_QUIET QUIET) +endif () +pkg_check_modules(PC_LIBELEMENTARY ${_QUIET} elementary) set(ELEMENTARY_DEFINITIONS ${PC_LIBELEMENTARY_CFLAGS_OTHER}) find_path(ELEMENTARY_INCLUDE_DIR Elementary.h diff --git a/legacy/eobj/cmake/Modules/FindEvas.cmake b/legacy/eobj/cmake/Modules/FindEvas.cmake index fe980d3541..25a81fa327 100644 --- a/legacy/eobj/cmake/Modules/FindEvas.cmake +++ b/legacy/eobj/cmake/Modules/FindEvas.cmake @@ -6,7 +6,11 @@ # EVAS_DEFINITIONS - Compiler switches required for using evas find_package(PkgConfig) -pkg_check_modules(PC_LIBEVAS QUIET evas) +if ("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER "2.8.1") + # "QUIET" was introduced in 2.8.2 + set(_QUIET QUIET) +endif () +pkg_check_modules(PC_LIBEVAS ${_QUIET} evas) set(EVAS_DEFINITIONS ${PC_LIBEVAS_CFLAGS_OTHER}) find_path(EVAS_INCLUDE_DIR Evas.h