From a252fdcc3a86d47f3aabeb0b20de70322011c16b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Mon, 12 Nov 2018 07:43:22 +0100 Subject: [PATCH] - updated libx23 patch, rel 2 --- cmake-libx32.patch | 8 ++++---- cmake.spec | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmake-libx32.patch b/cmake-libx32.patch index 9afffbf..3832bd3 100644 --- a/cmake-libx32.patch +++ b/cmake-libx32.patch @@ -4,10 +4,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 libx32) -+ find_library(ZLIB_LIBRARY_DEBUG NAMES ${ZLIB_NAMES_DEBUG} ${${search}} PATH_SUFFIXES libx32) +- 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 libx32) ++ find_library(ZLIB_LIBRARY_DEBUG NAMES ${ZLIB_NAMES_DEBUG} NAMES_PER_DIR ${${search}} PATH_SUFFIXES libx32) endforeach() include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake) diff --git a/cmake.spec b/cmake.spec index c5ccca5..8da5dcd 100644 --- a/cmake.spec +++ b/cmake.spec @@ -20,7 +20,7 @@ Summary: Cross-platform, open-source make system Summary(pl.UTF-8): Wieloplatformowy system make o otwartych źródłach Name: cmake Version: 3.12.4 -Release: 1 +Release: 2 License: BSD Group: Development/Building Source0: https://cmake.org/files/v3.12/%{name}-%{version}.tar.gz -- 2.44.0