[packages/cmake] - updated to 3.12.4

adamg adamg at pld-linux.org
Sun Nov 4 08:59:46 CET 2018


commit 59c0184d4a68516fd95c6bb03c2fc58ad46c2a67
Author: Adam Gołębiowski <adamg at pld-linux.org>
Date:   Sun Nov 4 08:59:38 2018 +0100

    - updated to 3.12.4

 cmake-lib64.patch | 8 ++++----
 cmake.spec        | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/cmake.spec b/cmake.spec
index e3dba8d..c5ccca5 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -19,12 +19,12 @@
 Summary:	Cross-platform, open-source make system
 Summary(pl.UTF-8):	Wieloplatformowy system make o otwartych źródłach
 Name:		cmake
-Version:	3.11.4
+Version:	3.12.4
 Release:	1
 License:	BSD
 Group:		Development/Building
-Source0:	https://cmake.org/files/v3.11/%{name}-%{version}.tar.gz
-# Source0-md5:	72e168b3bad2f9c34dcebbad7af56ff0
+Source0:	https://cmake.org/files/v3.12/%{name}-%{version}.tar.gz
+# Source0-md5:	4970869480ee37c8f4c8e7f83c4359cd
 Patch0:		%{name}-lib64.patch
 Patch1:		%{name}-libx32.patch
 Patch2:		%{name}-helpers.patch
diff --git a/cmake-lib64.patch b/cmake-lib64.patch
index 7675ea4..358741f 100644
--- a/cmake-lib64.patch
+++ b/cmake-lib64.patch
@@ -15,10 +15,10 @@
  # Allow ZLIB_LIBRARY to be set manually, as the location of the zlib library
  if(NOT ZLIB_LIBRARY)
    foreach(search ${_ZLIB_SEARCHES})
--    find_library(ZLIB_LIBRARY_RELEASE NAMES ${ZLIB_NAMES} ${${search}} PATH_SUFFIXES lib)
--    find_library(ZLIB_LIBRARY_DEBUG NAMES ${ZLIB_NAMES_DEBUG} ${${search}} PATH_SUFFIXES lib)
-+    find_library(ZLIB_LIBRARY_RELEASE NAMES ${ZLIB_NAMES} ${${search}} PATH_SUFFIXES lib64)
-+    find_library(ZLIB_LIBRARY_DEBUG NAMES ${ZLIB_NAMES_DEBUG} ${${search}} PATH_SUFFIXES lib64)
+-    find_library(ZLIB_LIBRARY_RELEASE NAMES ${ZLIB_NAMES} NAMES_PER_DIR ${${search}} PATH_SUFFIXES lib)
+-    find_library(ZLIB_LIBRARY_DEBUG NAMES ${ZLIB_NAMES_DEBUG} NAMES_PER_DIR ${${search}} PATH_SUFFIXES lib)
++    find_library(ZLIB_LIBRARY_RELEASE NAMES ${ZLIB_NAMES} NAMES_PER_DIR ${${search}} PATH_SUFFIXES lib64)
++    find_library(ZLIB_LIBRARY_DEBUG NAMES ${ZLIB_NAMES_DEBUG} NAMES_PER_DIR ${${search}} PATH_SUFFIXES lib64)
    endforeach()
  
    include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/cmake.git/commitdiff/59c0184d4a68516fd95c6bb03c2fc58ad46c2a67



More information about the pld-cvs-commit mailing list