From: Adam Gołębiowski Date: Sun, 4 Nov 2018 07:59:38 +0000 (+0100) Subject: - updated to 3.12.4 X-Git-Tag: auto/th/cmake-3.12.4-1 X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcmake.git;a=commitdiff_plain;h=59c0184d4a68516fd95c6bb03c2fc58ad46c2a67 - updated to 3.12.4 --- 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) 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