mirror of
https://github.com/beard7n/bsdports.git
synced 2026-04-10 10:31:20 +02:00
update cmake
This commit is contained in:
@@ -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.")
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user