diff options
| author | Albert Astals Cid <aacid@kde.org> | 2021-02-03 00:11:05 +0100 |
|---|---|---|
| committer | Albert Astals Cid <tsdgeos@yahoo.es> | 2021-03-01 21:26:38 +0000 |
| commit | e85ba5cc74f283398fb97e0c568c43970bf29fa3 (patch) | |
| tree | 17c2769e441f6ba22d753387980b13ed1bd4f1ca /cmake | |
| parent | 73c1e61b183db17692b3ddec51f1859ed4030765 (diff) | |
Require the newer cmake provided by the new base CI
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindGLIB.cmake | 6 | ||||
| -rw-r--r-- | cmake/modules/FindGTK.cmake | 6 | ||||
| -rw-r--r-- | cmake/modules/FindNSS3.cmake | 6 |
3 files changed, 3 insertions, 15 deletions
diff --git a/cmake/modules/FindGLIB.cmake b/cmake/modules/FindGLIB.cmake index d54ec4b4..be9d6fc8 100644 --- a/cmake/modules/FindGLIB.cmake +++ b/cmake/modules/FindGLIB.cmake @@ -15,10 +15,6 @@ include(FindPackageHandleStandardArgs) find_package(PkgConfig REQUIRED) -if(${CMAKE_VERSION} VERSION_LESS "3.6.0") - pkg_check_modules(GLIB2 "glib-2.0>=${GLIB_REQUIRED}" "gobject-2.0>=${GLIB_REQUIRED}" "gio-2.0>=${GLIB_REQUIRED}") -else() - pkg_check_modules(GLIB2 IMPORTED_TARGET "glib-2.0>=${GLIB_REQUIRED}" "gobject-2.0>=${GLIB_REQUIRED}" "gio-2.0>=${GLIB_REQUIRED}") -endif() +pkg_check_modules(GLIB2 IMPORTED_TARGET "glib-2.0>=${GLIB_REQUIRED}" "gobject-2.0>=${GLIB_REQUIRED}" "gio-2.0>=${GLIB_REQUIRED}") find_package_handle_standard_args(GLIB DEFAULT_MSG GLIB2_LIBRARIES GLIB2_CFLAGS) diff --git a/cmake/modules/FindGTK.cmake b/cmake/modules/FindGTK.cmake index 5f793aac..20561343 100644 --- a/cmake/modules/FindGTK.cmake +++ b/cmake/modules/FindGTK.cmake @@ -16,10 +16,6 @@ include(FindPackageHandleStandardArgs) find_package(PkgConfig REQUIRED) -if(${CMAKE_VERSION} VERSION_LESS "3.6.0") - pkg_check_modules(GTK3 "gtk+-3.0>=${GTK_REQUIRED}" "gdk-pixbuf-2.0>=${GDK_PIXBUF_REQUIRED}") -else() - pkg_check_modules(GTK3 IMPORTED_TARGET "gtk+-3.0>=${GTK_REQUIRED}" "gdk-pixbuf-2.0>=${GDK_PIXBUF_REQUIRED}") -endif() +pkg_check_modules(GTK3 IMPORTED_TARGET "gtk+-3.0>=${GTK_REQUIRED}" "gdk-pixbuf-2.0>=${GDK_PIXBUF_REQUIRED}") find_package_handle_standard_args(GTK DEFAULT_MSG GTK3_LIBRARIES GTK3_CFLAGS) diff --git a/cmake/modules/FindNSS3.cmake b/cmake/modules/FindNSS3.cmake index 6b47be4c..c0820b26 100644 --- a/cmake/modules/FindNSS3.cmake +++ b/cmake/modules/FindNSS3.cmake @@ -15,11 +15,7 @@ include(FindPackageHandleStandardArgs) if (NOT MSVC) find_package(PkgConfig REQUIRED) - if(${CMAKE_VERSION} VERSION_LESS "3.6.0") - pkg_check_modules(NSS3 "nss>=3.19") - else () - pkg_check_modules(NSS3 IMPORTED_TARGET "nss>=3.19") - endif() + pkg_check_modules(NSS3 IMPORTED_TARGET "nss>=3.19") find_package_handle_standard_args(NSS3 DEFAULT_MSG NSS3_LIBRARIES NSS3_CFLAGS) |