From 9fbb7bbdd6643686b0c4ef06d8cb1df6cb312fb0 Mon Sep 17 00:00:00 2001 From: ziggi Date: Sat, 16 May 2020 10:58:22 +0000 Subject: [PATCH] update cmake --- devel/cmake/files/InitialCache.cmake~ | 29 ------------------- .../cmake/files/patch-Modules_FindFLEX.cmake~ | 20 ------------- 2 files changed, 49 deletions(-) delete mode 100644 devel/cmake/files/InitialCache.cmake~ delete mode 100644 devel/cmake/files/patch-Modules_FindFLEX.cmake~ diff --git a/devel/cmake/files/InitialCache.cmake~ b/devel/cmake/files/InitialCache.cmake~ deleted file mode 100644 index ee769818..00000000 --- a/devel/cmake/files/InitialCache.cmake~ +++ /dev/null @@ -1,29 +0,0 @@ -# Disable CMake's tests while building. We are not interested in them when -# building packages/ports, and it may create problems if part of some -# dependencies are installed (for example, devel/qmake4 is installed, but -# devel/qt4-corelib is not). -# See https://mail.kde.org/pipermail/kde-freebsd/2013-July/015703.html -set(BUILD_TESTING OFF CACHE BOOL "Build the testing tree.") - -# Force CMake to look for base's liblzma, otherwise the configuration process -# will fail if archivers/lzmalib is installed, as CMake will try to use its -# liblzma.so. -# Note that this is necessary only for `make configure' to work, as liblzma is -# only ever used if CMake's bundled libarchive is being used. -set(LIBLZMA_INCLUDE_DIR "/usr/include" CACHE PATH - "Directory where LibLZMA headers are located.") -set(LIBLZMA_LIBRARY "/usr/lib/liblzma.so" CACHE PATH - "LibLZMA library to link against.") - -# Set (or not) by the CPACK option by replacing @@CPACK_OPTION_VALUE@@ -# with the value of the option itself. -# -set(CPACK_ENABLE_FREEBSD_PKG @@CPACK_OPTION_VALUE@@ CACHE BOOL "Enable pkg(8) generator in CPack") -# Use base libarchive instead of ports, because libpkg uses base -@@CPACK_OPTION_COMMENT@@set(LibArchive_INCLUDE_DIR "/usr/include" CACHE PATH -@@CPACK_OPTION_COMMENT@@ "Directory where LibArchive headers are located.") -# Hack to (a) prevent using either ports libarchive or the bundled version -# and (b) libpkg links to base libarchive. -@@CPACK_OPTION_COMMENT@@set(LibArchive_LIBRARY "/usr/lib/libthr.so;/usr/lib/libarchive.so" CACHE PATH -@@CPACK_OPTION_COMMENT@@ "LibArchive library to link against.") - diff --git a/devel/cmake/files/patch-Modules_FindFLEX.cmake~ b/devel/cmake/files/patch-Modules_FindFLEX.cmake~ deleted file mode 100644 index 0d448b43..00000000 --- a/devel/cmake/files/patch-Modules_FindFLEX.cmake~ +++ /dev/null @@ -1,20 +0,0 @@ ---- Modules/FindFLEX.cmake.orig 2020-01-19 09:02:30 UTC -+++ Modules/FindFLEX.cmake -@@ -103,10 +103,15 @@ find_program(FLEX_EXECUTABLE NAMES flex win_flex DOC " - mark_as_advanced(FLEX_EXECUTABLE) - - find_library(FL_LIBRARY NAMES fl -- DOC "Path to the fl library") -+ DOC "Path to the fl library" -+ PATHS %%LOCALBASE%%/lib -+ ) - - find_path(FLEX_INCLUDE_DIR FlexLexer.h -- DOC "Path to the flex headers") -+ DOC "Path to the flex headers" -+ PATHS %%LOCALBASE%%/include -+ PATH_SUFFIXES flex -+ ) - - mark_as_advanced(FL_LIBRARY FLEX_INCLUDE_DIR) -