On Sun Apr 24, 2022 at 12:33:48PM +0200, Rafael Sadowski wrote:
> Hi porters,
>
> it took a long time because I always ran into challenges/issues with new
> CMake versions. Here is a update diff to update CMake to the latest
> stable version 3.23.1.
>
> The following changes are important:
>
> - Drop cmComputeLinkInformation.cxx patch
> I don't understand why we still have this "workaround". Everything works
> WITHOUT it. It comes from very old dark times and was never validated again.
> I'm happy to drop it!
>
> - cmGeneratorTarget.cxx patch
> cmValue needs heap variables, that fixes a possible crash. Nevertheless,
> I still don't like this solution because nothing deletes the string.
> I have to dig dipper in the CMake memory management system. Anyway, not
> perfect but better than now. I will discuss this with upstream.
>
> - CFLAGS, CXXFLAGS, LDFLAGS
> cmake.port.mk now respects C/CXX/LD flags. With is CMAKE_*_FLAGS_* is obsolete.
> The following diff fix this.
>
> I have taken a lot of trouble to test the cmake ports. However, I am sure
> that I have not caught all of them or that I am still in the process of
> doing so.
>
> A bulk build would help me a lot. So I can fix the missing ones.
>
> I am very grateful for your feedback and/or a second eye.
>
*final diff*
This diff contains the feedback from tb@ bulk. I think we are
ready for more bulk builds and/or OKs.
A test on !amd64/lld would be nice. Can anyone help here?
Thanks team, thanks tb@!
Rafael
diff --git a/astro/stellarium/Makefile b/astro/stellarium/Makefile
index 2c320c665d1..de5efb23fec 100644
--- a/astro/stellarium/Makefile
+++ b/astro/stellarium/Makefile
@@ -43,12 +43,13 @@ RUN_DEPENDS= net/curl \
CONFIGURE_ENV= HOME=${WRKDIR}
-CONFIGURE_ARGS= -DCMAKE_C_FLAGS="${CFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include" \
- -DCMAKE_CXX_FLAGS="${CXXFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include" \
- -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON \
+CONFIGURE_ARGS= -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON \
-DENABLE_LIBGPS=0 \
-DSTELLARIUM_RELEASE_BUILD=1
+CFLAGS += -I${LOCALBASE}/include -I${X11BASE}/include
+CXXFLAGS += -I${LOCALBASE}/include -I${X11BASE}/include
+
PORTHOME= ${WRKDIR}
NO_TEST= Yes
diff --git a/audio/chromaprint/Makefile b/audio/chromaprint/Makefile
index e5dc3173dfe..7565d8e6c6a 100644
--- a/audio/chromaprint/Makefile
+++ b/audio/chromaprint/Makefile
@@ -32,6 +32,8 @@ CONFIGURE_ARGS = -DBUILD_TOOLS=ON \
TEST_TARGET = check
+MODCMAKE_LDFLAGS = -L${LOCALBASE}/lib
+
pre-configure:
${SUBST_CMD} ${WRKSRC}/cmake/modules/FindGTest.cmake
diff --git a/audio/clementine/Makefile b/audio/clementine/Makefile
index 2cb78bf3da3..804de849c36 100644
--- a/audio/clementine/Makefile
+++ b/audio/clementine/Makefile
@@ -60,6 +60,8 @@ CONFIGURE_ARGS += -DBUILD_WERROR=ON
# is missing. To be investigated.
CONFIGURE_ARGS += -DBUNDLE_PROJECTM_PRESETS=ON
+MODCMAKE_LDFLAGS = -L${LOCALBASE}/lib
+
post-extract:
cp ${FILESDIR}/config.h.in ${WRKSRC}/ext/libclementine-common/
diff --git a/audio/mscore/Makefile b/audio/mscore/Makefile
index 993d98e9355..0eca7b3d8d5 100644
--- a/audio/mscore/Makefile
+++ b/audio/mscore/Makefile
@@ -41,7 +41,6 @@ RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+3,-guic
CONFIGURE_ARGS =-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
- -DCMAKE_CXX_FLAGS="${CXXFLAGS} -Wno-inconsistent-missing-override" \
-DBUILD_ALSA=OFF \
-DBUILD_JACK=OFF \
-DBUILD_PORTMIDI=OFF \
@@ -53,6 +52,10 @@ CONFIGURE_ARGS =-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
-DDOWNLOAD_SOUNDFONT=OFF \
-DBUILD_TELEMETRY_MODULE=OFF
+CXXFLAGS += -Wno-inconsistent-missing-override
+CXXFLAGS += -I${LOCALBASE}/include -I${X11BASE}/include
+MODCMAKE_LDFLAGS = -L${X11BASE}/lib -L${LOCALBASE}/lib
+
.if ${MACHINE_ARCH} == "mips64" || ${MACHINE_ARCH} == "mips64el"
CXXFLAGS += -mxgot
.endif
diff --git a/cad/graywolf/Makefile b/cad/graywolf/Makefile
index f836bfd9a43..18216db1401 100644
--- a/cad/graywolf/Makefile
+++ b/cad/graywolf/Makefile
@@ -21,7 +21,7 @@ MODULES = devel/cmake
LIB_DEPENDS = devel/gsl
# Really really not C99
-CONFIGURE_ARGS = -DCMAKE_C_FLAGS="${CFLAGS} -Wno-return-type"
+CFLAGS += -Wno-return-type
NO_TEST = Yes
diff --git a/cad/oce/Makefile b/cad/oce/Makefile
index 612ecae400b..1ec17922ed9 100644
--- a/cad/oce/Makefile
+++ b/cad/oce/Makefile
@@ -39,8 +39,9 @@ LIB_DEPENDS = ${MODTK_LIB_DEPENDS}
RUN_DEPENDS = ${MODTK_RUN_DEPENDS} \
shells/bash
-CONFIGURE_ARGS += -DCMAKE_CXX_FLAGS="-I${X11BASE}/include ${CXXFLAGS}" \
- -DINSTALL_DIR_RESOURCE:STRING="share/opencascade/src"
+CONFIGURE_ARGS += -DINSTALL_DIR_RESOURCE:STRING="share/opencascade/src"
+
+CXXFLAGS += -I${X11BASE}/include
.include <bsd.port.arch.mk>
.if ${PROPERTIES:Mlp64}
diff --git a/comms/gammu/Makefile b/comms/gammu/Makefile
index b134bc33153..79ea851d262 100644
--- a/comms/gammu/Makefile
+++ b/comms/gammu/Makefile
@@ -32,9 +32,11 @@ TEST_DEPENDS = devel/cmake
CONFIGURE_ARGS += -DINSTALL_MAN_DIR:STRING=man \
-DINSTALL_BASH_COMPLETION=OFF \
- -DCMAKE_EXE_LINKER_FLAGS="-L${LOCALBASE}/lib -liconv -lintl" \
-Wno-dev
+CFLAGS += -I${LOCALBASE}/include
+MODCMAKE_LDFLAGS = -L${LOCALBASE}/lib -liconv -lintl
+
FLAVORS += mysql pgsql
FLAVOR ?=
SEPARATE_BUILD = flavored
diff --git a/comms/hackrf/Makefile b/comms/hackrf/Makefile
index af518f77a31..c77715895df 100644
--- a/comms/hackrf/Makefile
+++ b/comms/hackrf/Makefile
@@ -27,7 +27,8 @@ MODULES = devel/cmake
LIB_DEPENDS = devel/libusb1 \
math/fftw3,float
-CONFIGURE_ARGS = -DCMAKE_C_FLAGS="${CFLAGS} -I${LOCALBASE}/include"
+CFLAGS += -I${LOCALBASE}/include
+MODCMAKE_LDFLAGS = -L${LOCALBASE}/lib
NO_TEST = Yes
diff --git a/converters/opencc/Makefile b/converters/opencc/Makefile
index fbb118fbdaf..cbae9dbd79a 100644
--- a/converters/opencc/Makefile
+++ b/converters/opencc/Makefile
@@ -27,8 +27,9 @@ MODULES = devel/cmake \
LIB_DEPENDS = textproc/libmarisa,-main
-CONFIGURE_ARGS = -DUSE_SYSTEM_MARISA=ON \
- -DCMAKE_CXX_FLAGS="-I${LOCALBASE}/include -L${LOCALBASE}/lib"
+CONFIGURE_ARGS = -DUSE_SYSTEM_MARISA=ON
+
+CXXFLAGS += -I${LOCALBASE}/include -L${LOCALBASE}/lib
MODPY_RUNDEP = No
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index 9bece82fca1..58914cf250c 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -63,9 +63,10 @@ CONFIGURE_ARGS= -DWITH_KRB5=OFF \
-DWITH_LIBDB_CFLAGS="-I${LOCALBASE}/include/db4" \
-DWITH_LIBDB_LIBS="-L${LOCALBASE}/lib -ldb" \
-DWITH_OPENLDAP=${LOCALBASE} \
- -DCMAKE_C_FLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-DWITH_GWEATHER4=ON
+CFLAGS += -I${LOCALBASE}/include
+
DEBUG_PACKAGES= ${BUILD_PACKAGES}
pre-configure:
diff --git a/databases/kexi/patches/patch-CMakeLists_txt b/databases/kexi/patches/patch-CMakeLists_txt
index e06101077b5..9f53509166d 100644
--- a/databases/kexi/patches/patch-CMakeLists_txt
+++ b/databases/kexi/patches/patch-CMakeLists_txt
@@ -1,6 +1,15 @@
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
+@@ -106,7 +106,7 @@ set_package_properties(KF5Crash PROPERTIES TYPE OPTION
+ PURPOSE "Used to provide crash reporting on Linux")
+
+ set(REQUIRED_QT_VERSION 5.4.0)
+-find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS Core Gui Widgets Xml Network PrintSupport Test)
++find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS Core Gui Widgets Xml Network PrintSupport Test Sensors)
+ find_package(Qt5 ${REQUIRED_QT_VERSION} COMPONENTS UiTools WebKit WebKitWidgets)
+
+ # use sane compile flags
@@ -198,8 +198,8 @@ endif()
##
## Test for marble
diff --git a/devel/bullet/Makefile b/devel/bullet/Makefile
index 5c137f04d74..e3e0004ed59 100644
--- a/devel/bullet/Makefile
+++ b/devel/bullet/Makefile
@@ -51,15 +51,13 @@ CONFIGURE_ARGS += -DBUILD_SHARED_LIBS=ON \
-DBUILD_EXTRAS=ON \
-DBUILD_PYBULLET=OFF \
-DINSTALL_LIBS=ON \
- -DCMAKE_SHARED_LINKER_FLAGS="-L${X11BASE}/lib" \
- -DCMAKE_MODULE_LINKER_FLAGS="-L${X11BASE}/lib" \
- -DCMAKE_EXE_LINKER_FLAGS="-L${X11BASE}/lib" \
-DUSE_DOUBLE_PRECISION=ON
NO_TEST = Yes
CFLAGS += -I${X11BASE}/include
CXXFLAGS += -I${X11BASE}/include
+MODCMAKE_LDFLAGS = -L${X11BASE}/lib
post-install:
rm -rf ${PREFIX}/include/bullet/pybullet
diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
index f78be08e8cf..4396a695c6c 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -2,14 +2,15 @@ DPB_PROPERTIES = parallel
COMMENT = portable build system
-VER = 3.20.3
+VER = 3.23.1
EPOCH = 0
DISTNAME = cmake-${VER}
CATEGORIES = devel
-REVISION = 6
HOMEPAGE = https://www.cmake.org/
+MAINTAINER = Rafael Sadowski <rsadowski@openbsd.org>
+
MASTER_SITES = https://www.cmake.org/files/v${VER:R}/
# BSD
diff --git a/devel/cmake/cmake.port.mk b/devel/cmake/cmake.port.mk
index c9cb46a8bc5..a9d697c16b3 100644
--- a/devel/cmake/cmake.port.mk
+++ b/devel/cmake/cmake.port.mk
@@ -99,6 +99,18 @@ CONFIGURE_ENV += MODTK_VERSION=${MODTK_VERSION} \
MODTK_LIB=${MODTK_LIB}
.endif
+
+.if ! empty(MODCMAKE_LDFLAGS)
+# https://cmake.org/cmake/help/latest/envvar/LDFLAGS.html
+# Will only be used by CMake on the first configuration to determine the
+# default linker flags, after which the value for LDFLAGS is stored in the
+# cache as CMAKE_EXE_LINKER_FLAGS_INIT, CMAKE_SHARED_LINKER_FLAGS_INIT, and
+# CMAKE_MODULE_LINKER_FLAGS_INIT. For any configuration run (including the
+# first), the environment variable will be ignored if the equivalent
+# CMAKE_<TYPE>_LINKER_FLAGS_INIT variable is defined.
+CONFIGURE_ENV += LDFLAGS="${MODCMAKE_LDFLAGS}"
+.endif
+
MODCMAKE_DEBUG ?= No
.if empty(CONFIGURE_STYLE)
diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo
index b1a80390a39..438a146b98d 100644
--- a/devel/cmake/distinfo
+++ b/devel/cmake/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cmake-3.20.3.tar.gz) = TQCKw0YeJx/PrCagWTb3f8erZEAhVvs3HUEoSFGmUbg=
-SIZE (cmake-3.20.3.tar.gz) = 9440009
+SHA256 (cmake-3.23.1.tar.gz) = M/0QqOxoek0NW0JHPxBFm7krOufe8rdF3BCxknYIafM=
+SIZE (cmake-3.23.1.tar.gz) = 9982020
diff --git a/devel/cmake/patches/patch-Modules_FindOpenMP_cmake b/devel/cmake/patches/patch-Modules_FindOpenMP_cmake
index 759c89a2dc0..45afb6cd2ea 100644
--- a/devel/cmake/patches/patch-Modules_FindOpenMP_cmake
+++ b/devel/cmake/patches/patch-Modules_FindOpenMP_cmake
@@ -3,13 +3,14 @@ Add libs and paths. Ensure the lib is used for the C case.
Index: Modules/FindOpenMP.cmake
--- Modules/FindOpenMP.cmake.orig
+++ Modules/FindOpenMP.cmake
-@@ -101,8 +101,8 @@ function(_OPENMP_FLAG_CANDIDATES LANG)
+@@ -101,9 +101,9 @@ function(_OPENMP_FLAG_CANDIDATES LANG)
if(NOT OpenMP_${LANG}_FLAG)
unset(OpenMP_FLAG_CANDIDATES)
- set(OMP_FLAG_GNU "-fopenmp")
-- set(OMP_FLAG_Clang "-fopenmp=libomp" "-fopenmp=libiomp5" "-fopenmp" "-Xclang -fopenmp")
+ set(OMP_FLAG_GNU "-fopenmp -lgomp")
+ set(OMP_FLAG_LCC "-fopenmp")
+- set(OMP_FLAG_Clang "-fopenmp=libomp" "-fopenmp=libiomp5" "-fopenmp" "-Xclang -fopenmp")
+ set(OMP_FLAG_Clang "-fopenmp -I${LOCALBASE}/include -Wl,-L${LOCALBASE}/lib,-lomp")
set(OMP_FLAG_AppleClang "-Xclang -fopenmp")
set(OMP_FLAG_HP "+Oopenmp")
diff --git a/devel/cmake/patches/patch-Source_cmComputeLinkInformation_cxx b/devel/cmake/patches/patch-Source_cmComputeLinkInformation_cxx
deleted file mode 100644
index 102d7687fec..00000000000
--- a/devel/cmake/patches/patch-Source_cmComputeLinkInformation_cxx
+++ /dev/null
@@ -1,89 +0,0 @@
-Index: Source/cmComputeLinkInformation.cxx
---- Source/cmComputeLinkInformation.cxx.orig
-+++ Source/cmComputeLinkInformation.cxx
-@@ -371,8 +371,9 @@ cmComputeLinkInformation::cmComputeLinkInformation(
- this->OrderRuntimeSearchPath->AddUserDirectories(directories);
-
- // Set up the implicit link directories.
-- this->LoadImplicitLinkInfo();
-+ this->LoadImplicitLinkInfoOpenBSD();
- this->OrderLinkerSearchPath->SetImplicitDirectories(this->ImplicitLinkDirs);
-+ this->LoadImplicitLinkInfo();
- this->OrderRuntimeSearchPath->SetImplicitDirectories(this->ImplicitLinkDirs);
- if (this->OrderDependentRPath) {
- this->OrderDependentRPath->SetImplicitDirectories(this->ImplicitLinkDirs);
-@@ -713,10 +714,20 @@ void cmComputeLinkInformation::AddItem(BT<std::string>
- // This is a directory.
- this->DropDirectoryItem(item.Value);
- } else {
-- // Use the full path given to the library file.
- this->Depends.push_back(item.Value);
-- this->AddFullItem(item);
-- this->AddLibraryRuntimeInfo(item.Value);
-+ if (!this->OpenBSD) {
-+ // Use the full path given to the library file.
-+ this->AddFullItem(item);
-+ this->AddLibraryRuntimeInfo(item.Value);
-+ } else {
-+ if (cmHasLiteralSuffix(item.Value, ".o"))
-+ this->AddFullItem(item);
-+ else {
-+ std::string file = cmSystemTools::GetFilenameName(item.Value);
-+ this->AddUserItem(file, false);
-+ }
-+ this->OrderLinkerSearchPath->AddLinkLibrary(item.Value);
-+ }
- }
- } else {
- // This is a library or option specified by the user.
-@@ -1049,11 +1060,18 @@ void cmComputeLinkInformation::AddTargetItem(BT<std::s
- this->SharedLibrariesLinked.insert(target);
- }
-
-+ if (this->OpenBSD) {
-+ if (target->GetType() == cmStateEnums::SHARED_LIBRARY) {
-+ this->AddSharedLibNoSOName(item.Value);
-+ return;
-+ }
-+ } else {
- // Handle case of an imported shared library with no soname.
-- if (this->NoSONameUsesPath &&
-- target->IsImportedSharedLibWithoutSOName(this->Config)) {
-- this->AddSharedLibNoSOName(item.Value);
-- return;
-+ if (this->NoSONameUsesPath &&
-+ target->IsImportedSharedLibWithoutSOName(this->Config)) {
-+ this->AddSharedLibNoSOName(item.Value);
-+ return;
-+ }
- }
-
- // For compatibility with CMake 2.4 include the item's directory in
-@@ -1066,6 +1084,27 @@ void cmComputeLinkInformation::AddTargetItem(BT<std::s
-
- // Now add the full path to the library.
- this->Items.emplace_back(item, true, target);
-+}
-+
-+void cmComputeLinkInformation::LoadImplicitLinkInfoOpenBSD()
-+{
-+ std::vector<std::string> implicitDirVec;
-+
-+ // Get platform-wide implicit directories.
-+ if (cmProp implicitLinks =
-+ this->Makefile->GetDefinition("CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES")) {
-+ this->Makefile->GetDefExpandList(*implicitLinks, implicitDirVec);
-+ }
-+
-+ // Append library architecture to all implicit platform directories
-+ // and add them to the set
-+ if (cmProp libraryArch =
-+ this->Makefile->GetDefinition("CMAKE_LIBRARY_ARCHITECTURE")) {
-+ for (std::vector<std::string>::const_iterator i = implicitDirVec.begin();
-+ i != implicitDirVec.end(); ++i) {
-+ this->ImplicitLinkDirs.insert(*i + "/" + *libraryArch);
-+ }
-+ }
- }
-
- void cmComputeLinkInformation::AddFullItem(BT<std::string> const& item)
diff --git a/devel/cmake/patches/patch-Source_cmComputeLinkInformation_h b/devel/cmake/patches/patch-Source_cmComputeLinkInformation_h
deleted file mode 100644
index c6bafda5667..00000000000
--- a/devel/cmake/patches/patch-Source_cmComputeLinkInformation_h
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: Source/cmComputeLinkInformation.h
---- Source/cmComputeLinkInformation.h.orig
-+++ Source/cmComputeLinkInformation.h
-@@ -175,6 +175,7 @@ class cmComputeLinkInformation (private)
-
- // Implicit link libraries and directories for linker language.
- void LoadImplicitLinkInfo();
-+ void LoadImplicitLinkInfoOpenBSD();
- void AddImplicitLinkInfo();
- void AddImplicitLinkInfo(std::string const& lang);
- void AddRuntimeLinkLibrary(std::string const& lang);
diff --git a/devel/cmake/patches/patch-Source_cmFileCommand_cxx b/devel/cmake/patches/patch-Source_cmFileCommand_cxx
index 103475f0ffd..0ed0e8d7955 100644
--- a/devel/cmake/patches/patch-Source_cmFileCommand_cxx
+++ b/devel/cmake/patches/patch-Source_cmFileCommand_cxx
@@ -1,7 +1,7 @@
Index: Source/cmFileCommand.cxx
--- Source/cmFileCommand.cxx.orig
+++ Source/cmFileCommand.cxx
-@@ -1599,6 +1599,12 @@ bool HandleDownloadCommand(std::vector<std::string> co
+@@ -1751,6 +1751,12 @@ bool HandleDownloadCommand(std::vector<std::string> co
cmExecutionStatus& status)
{
#if !defined(CMAKE_BOOTSTRAP)
@@ -14,7 +14,7 @@ Index: Source/cmFileCommand.cxx
auto i = args.begin();
if (args.size() < 2) {
status.SetError("DOWNLOAD must be called with at least two arguments.");
-@@ -1985,6 +1991,12 @@ bool HandleUploadCommand(std::vector<std::string> cons
+@@ -2135,6 +2141,12 @@ bool HandleUploadCommand(std::vector<std::string> cons
cmExecutionStatus& status)
{
#if !defined(CMAKE_BOOTSTRAP)
diff --git a/devel/cmake/patches/patch-Source_cmFindPackageCommand_cxx b/devel/cmake/patches/patch-Source_cmFindPackageCommand_cxx
index 4ef054162f8..d8fe4445f26 100644
--- a/devel/cmake/patches/patch-Source_cmFindPackageCommand_cxx
+++ b/devel/cmake/patches/patch-Source_cmFindPackageCommand_cxx
@@ -3,7 +3,7 @@ Disable find_package QUIET option in openbsd ports builds.
Index: Source/cmFindPackageCommand.cxx
--- Source/cmFindPackageCommand.cxx.orig
+++ Source/cmFindPackageCommand.cxx
-@@ -256,7 +256,13 @@ bool cmFindPackageCommand::InitialPass(std::vector<std
+@@ -257,7 +257,13 @@ bool cmFindPackageCommand::InitialPass(std::vector<std
std::set<unsigned int> moduleArgs;
for (unsigned int i = 1; i < args.size(); ++i) {
if (args[i] == "QUIET") {
diff --git a/devel/cmake/patches/patch-Source_cmGeneratorTarget_cxx b/devel/cmake/patches/patch-Source_cmGeneratorTarget_cxx
index e735c0eecba..7a7759ad7f8 100644
--- a/devel/cmake/patches/patch-Source_cmGeneratorTarget_cxx
+++ b/devel/cmake/patches/patch-Source_cmGeneratorTarget_cxx
@@ -1,7 +1,7 @@
Index: Source/cmGeneratorTarget.cxx
--- Source/cmGeneratorTarget.cxx.orig
+++ Source/cmGeneratorTarget.cxx
-@@ -4837,6 +4837,50 @@ cmGeneratorTarget::Names cmGeneratorTarget::GetLibrary
+@@ -5113,6 +5113,50 @@ cmGeneratorTarget::Names cmGeneratorTarget::GetLibrary
// The library name.
targetNames.Output = prefix + targetNames.Base + suffix;
@@ -35,15 +35,15 @@ Index: Source/cmGeneratorTarget.cxx
+ this->LocalGenerator->IssueMessage(MessageType::INTERNAL_ERROR, msg);
+ }
+ else {
-+ version = new std::string(lib_version);
-+ soversion = new std::string(lib_version);
++ version = cmValue(new std::string(lib_version));
++ soversion = cmValue(new std::string(lib_version));
+ }
+ }
+ }
+ else {
+ if (soversion) {
-+ version = new std::string("0.0");
-+ soversion = new std::string("0.0");
++ version = cmValue(new std::string("0.0"));
++ soversion = cmValue(new std::string("0.0"));
+ }
+ }
+ }
diff --git a/devel/cmake/patches/patch-Source_cmGlobalGenerator_cxx b/devel/cmake/patches/patch-Source_cmGlobalGenerator_cxx
index 0ac4bd195f6..0e0f8728a22 100644
--- a/devel/cmake/patches/patch-Source_cmGlobalGenerator_cxx
+++ b/devel/cmake/patches/patch-Source_cmGlobalGenerator_cxx
@@ -1,7 +1,7 @@
Index: Source/cmGlobalGenerator.cxx
--- Source/cmGlobalGenerator.cxx.orig
+++ Source/cmGlobalGenerator.cxx
-@@ -2601,6 +2601,9 @@ void cmGlobalGenerator::AddGlobalTarget_Test(
+@@ -2676,6 +2676,9 @@ void cmGlobalGenerator::AddGlobalTarget_Test(
cmCustomCommandLine singleLine;
singleLine.push_back(cmSystemTools::GetCTestCommand());
singleLine.push_back("--force-new-ctest-process");
diff --git a/devel/cmake/patches/patch-Source_cmInstallCommand_cxx b/devel/cmake/patches/patch-Source_cmInstallCommand_cxx
index 6ee5e026431..b06ff1643c9 100644
--- a/devel/cmake/patches/patch-Source_cmInstallCommand_cxx
+++ b/devel/cmake/patches/patch-Source_cmInstallCommand_cxx
@@ -1,7 +1,7 @@
Index: Source/cmInstallCommand.cxx
--- Source/cmInstallCommand.cxx.orig
+++ Source/cmInstallCommand.cxx
-@@ -393,6 +393,9 @@ bool HandleTargetsMode(std::vector<std::string> const&
+@@ -639,6 +639,9 @@ bool HandleTargetsMode(std::vector<std::string> const&
}
// Select the mode for installing symlinks to versioned shared libraries.
@@ -11,7 +11,7 @@ Index: Source/cmInstallCommand.cxx
cmInstallTargetGenerator::NamelinkModeType namelinkMode =
cmInstallTargetGenerator::NamelinkModeNone;
if (libraryArgs.GetNamelinkOnly()) {
-@@ -400,6 +403,10 @@ bool HandleTargetsMode(std::vector<std::string> const&
+@@ -646,6 +649,10 @@ bool HandleTargetsMode(std::vector<std::string> const&
} else if (libraryArgs.GetNamelinkSkip()) {
namelinkMode = cmInstallTargetGenerator::NamelinkModeSkip;
}
diff --git a/devel/cmake/patches/patch-Source_cmMessenger_cxx b/devel/cmake/patches/patch-Source_cmMessenger_cxx
index 94d5b014442..2a5ed65d05c 100644
--- a/devel/cmake/patches/patch-Source_cmMessenger_cxx
+++ b/devel/cmake/patches/patch-Source_cmMessenger_cxx
@@ -1,7 +1,7 @@
Index: Source/cmMessenger.cxx
--- Source/cmMessenger.cxx.orig
+++ Source/cmMessenger.cxx
-@@ -67,7 +67,7 @@ static bool printMessagePreamble(MessageType t, std::o
+@@ -71,7 +71,7 @@ static bool printMessagePreamble(MessageType t, std::o
if (t == MessageType::FATAL_ERROR) {
msg << "CMake Error";
} else if (t == MessageType::INTERNAL_ERROR) {
@@ -10,7 +10,7 @@ Index: Source/cmMessenger.cxx
} else if (t == MessageType::LOG) {
msg << "CMake Debug Log";
} else if (t == MessageType::DEPRECATION_ERROR) {
-@@ -105,19 +105,6 @@ void displayMessage(MessageType t, std::ostringstream&
+@@ -124,19 +124,6 @@ static void displayMessage(MessageType t, std::ostring
// Add a terminating blank line.
msg << "\n";
@@ -29,4 +29,4 @@ Index: Source/cmMessenger.cxx
-
No comments:
Post a Comment