[CMake] Troubles with ExternalProject_Add and PATCH_COMMAND
Hi everyone,
i try to patch a file from an externalprojects with the PATCH_COMMAND.
The patch file looks like:
--- project-config.jam 2019-07-18 17:21:44.008695808 +0200
+++ project-config.jam.tmp 2019-07-18 17:23:28.236474532 +0200
@@ -18,7 +18,7 @@
import python ;
if ! [ python.configured ]
{
- using python : 2.7 : /usr ;
+ using python : 3.7 : /usr ;
}
path-constant ICU_PATH : /usr ;
When i try to apply the patch manualy with patch originalfile <
patchfile it's working, but when i try it with the externalproject_add
command:
if(WITH_LIB_BOOST)
message(STATUS "Build WITH_LIB_BOOST.")
set(LIB_BOOST_INC_PATH ${OUTPUT_PATH}/libs/boost/include/)
set(LIB_BOOST_LIB_PATH ${OUTPUT_PATH}/libs/boost/lib)
set(LIB_BOOST_DEPS external_boost)
set(LIB_BOOST_STATIC_LIBS boost_python27)
ExternalProject_Add(external_boost
PREFIX ${CMAKE_BINARY_DIR}/boost
URL ${BOOST_URL}
DOWNLOAD_DIR ${CMAKE_BINARY_DIR}/boost
URL_HASH MD5=${BOOST_HASH}
PATCH_COMMAND /usr/bin/patch
${CMAKE_BINARY_DIR}/boost/src/external_boost/project-config.jam <
${CMAKE_SOURCE_DIR}/tools/patches/boost_python3.7.patch
CONFIGURE_COMMAND cd ${CMAKE_BINARY_DIR}/boost/src/external_boost/ &&
./bootstrap.sh --prefix=${OUTPUT_PATH}/libs/boost/
--with-libraries=python
BUILD_COMMAND cd ${CMAKE_BINARY_DIR}/boost/src/external_boost/ &&
./b2
INSTALL_COMMAND cd ${CMAKE_BINARY_DIR}/boost/src/external_boost/ && ./bjam
&& ./bjam install
INSTALL_DIR ${OUTPUT_PATH}/boost
)
endif()
But when running cmake i get the following output:
patching file
/home/stuv/projects/programming/bsEdit/build/boost/src/external_boost/project-config.jam
Hunk #1 FAILED at 18.
I have no idea what i'm doing wrong here, i hope someone here can help
me out.
best regards,
Steven Truppe
--
Powered by www.kitware.com
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Kitware offers various services to support the CMake community. For more
information on each offering, please visit:
CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Follow this link to subscribe/unsubscribe:
https://cmake.org/mailman/listinfo/cmake
Re: [CMake] getting compiler's include paths
The history behind the makefile generator and the custom dependency tracking logic was that it was written before the majority of compilers offered a robust way to generate the list of header dependencies. As it stands now we want to remove all this custom dependency scanning logic, not extend it to understand system headers ( As the naive approach would cause CMake to parse system headers, and slow down even more ). Luckily, C++20 modules also require us to drop the custom dependency scanning, so when we add C++20 module support to the Makefile generator this issue will be fixed as by product. On Wed, Jul 3, 2019 at 10:51 AM Robert Maynard wrote: > > I completely forgot that the Makefiles based generators in CMake have > a separate heuristic for determining system headers. > > If you use the Ninja generator I see the expected behavior: > ~/W/t/nbuild $ sudo touch /usr/include/c++/7/array > ~/W/t/nbuild $ ninja -d explain -v > ninja explain: output test/CMakeFiles/ProjTest.dir/test.cpp.o older > than most recent input /usr/include/c++/7/array (1562165327 vs > 1562165329) > ninja explain: test/CMakeFiles/ProjTest.dir/test.cpp.o is dirty > ninja explain: test/ProjTest is dirty > [1/2] /usr/bin/c++ -I../my_lib/include -std=gnu++1z -MD -MT > test/CMakeFiles/ProjTest.dir/test.cpp.o -MF > test/CMakeFiles/ProjTest.dir/test.cpp.o.d -o > test/CMakeFiles/ProjTest.dir/test.cpp.o -c ../test/test.cpp > [2/2] : && /usr/bin/c++ test/CMakeFiles/ProjTest.dir/test.cpp.o > -o test/ProjTest && : > > > I will need to spend some more time figuring out the extra include > caching logic for the Makefile based generators, and will report back. > > On Thu, Jun 27, 2019 at 8:59 AM jl forums wrote: > > > > thanks for the anwer > > quite not... I'm using cmake 3.14.2 (so, far away from 3.6) and have a > > look, in main.cpp, there is #include : > > > > $ find /usr/include/ -name filesystem > > /usr/include/c++/5/experimental/filesystem > > /usr/include/c++/7/experimental/filesystem > > /usr/include/c++/8/filesystem > > /usr/include/c++/8/experimental/filesystem > > $ sudo touch /usr/include/c++/5/experimental/filesystem > > /usr/include/c++/7/experimental/filesystem /usr/include/c++/8/filesystem > > /usr/include/c++/8/experimental/filesystem > > $ make > > [100%] Built target FileSync > > $ touch ../main.cxx > > $ make > > Scanning dependencies of target FileSync > > [ 50%] Building CXX object CMakeFiles/FileSync.dir/main.cxx.o > > [100%] Linking CXX executable FileSync > > [100%] Built target FileSync > > > > > > => cmake don't create "full include dependency" which IS a mistake > > updating system g++ can just assume the target is uptodate and in fact just > > create a broken build... > > > > in cmake cxx.includecache > > > > #IncludeRegexLine: ^[ ]*[#%][ ]*(include|import)[ ]*[<"]([^">]+)([">]) > > #IncludeRegexScan: ^.*$ > > #IncludeRegexComplain: ^$ > > #IncludeRegexTransform: > > /home/orange/crypt/Devel/projets/FileSync/main.cxx > > cstdio > > - > > io.h > > - > > fcntl.h > > - > > locale > > - > > clocale > > - > > fstream > > - > > iostream > > - > > filesystem > > - > > > > $ /usr/bin/gcc-8 -M ../main.cxx > > main.o: ../main.cxx /usr/x86_64-linux-gnu/include/stdc-predef.h \ > > /usr/include/c++/8/cstdio \ > > /usr/include/x86_64-linux-gnu/c++/8/bits/c++config.h \ > > /usr/include/x86_64-linux-gnu/c++/8/bits/os_defines.h \ > > /usr/x86_64-linux-gnu/include/features.h \ > > /usr/x86_64-linux-gnu/include/sys/cdefs.h \ > > /usr/x86_64-linux-gnu/include/bits/wordsize.h \ > > /usr/x86_64-linux-gnu/include/bits/long-double.h \ > > /usr/x86_64-linux-gnu/include/gnu/stubs.h \ > > /usr/x86_64-linux-gnu/include/gnu/stubs-64.h \ > > /usr/include/x86_64-linux-gnu/c++/8/bits/cpu_defines.h \ > > /usr/x86_64-linux-gnu/include/stdio.h \ > > /usr/x86_64-linux-gnu/include/bits/libc-header-start.h \ > > /usr/lib/gcc/x86_64-linux-gnu/8/include/stddef.h \ > > /usr/x86_64-linux-gnu/include/bits/types.h \ > > /usr/x86_64-linux-gnu/include/bits/typesizes.h \ > > /usr/x86_64-linux-gnu/include/bits/types/__FILE.h \ > > /usr/x86_64-linux-gnu/include/bits/types/FILE.h \ > > /usr/x86_64-linux-gnu/include/bits/libio.h \ > > /usr/x86_64-linux-gnu/include/bits/_G_config.h \ > > /usr/x86_64-linux-gnu/include/bits/types/__mbstate_t.h \ > > /usr/lib/gcc/x86_64-linux-gnu/8/include/stdarg.h \ > > /usr/x86_64-linux-gnu/include/bits/stdio_lim.h \ > > /usr/x86_64-linux-gnu/include/bits/sys_errlist.h \ > > /usr/include/c++/8/locale /usr/include/c++/8/bits/localefwd.h \ > > /usr/include/x86_64-linux-gnu/c++/8/bits/c++locale.h \ > > /usr/include/c++/8/clocale /usr/x86_64-linux-gnu/include/locale.h \ > > /usr/x86_64-linux-gnu/include/bits/locale.h \ > > /usr/x86_64-linux-gnu/include/bits/types/locale_t.h \ > > /usr/x86_64-linux-gnu/include/bits/types/__locale_t.h \ > > /usr/include/c++/8/iosfwd /usr/include/c++/8/bits/stringfwd.h \ > > /usr/include/c++/8/bits/memoryfwd.h /usr/include/c++/8/bits/postypes.h \ >
Re: [CMake] [DKIM: Failed] Troubles with ExternalProject_Add and PATCH_COMMAND
Hi Steven,
When you run patch manually, do you then supply the same absolute paths?
Looking at the patch file I noticed that it contains a relative path. So
maybe you should cd to
${CMAKE_BINARY_DIR}/boost/src/external_boost/project-config.jam before
running the patch command.
Cheers,
Marcel.
Op 18-07-19 om 17:29 schreef Steven Truppe:
>
> Hi everyone,
>
> i try to patch a file from an externalprojects with the PATCH_COMMAND.
>
> The patch file looks like:
>
> --- project-config.jam 2019-07-18 17:21:44.008695808 +0200
> +++ project-config.jam.tmp 2019-07-18 17:23:28.236474532 +0200
> @@ -18,7 +18,7 @@
> import python ;
> if ! [ python.configured ]
> {
> - using python : 2.7 : /usr ;
> + using python : 3.7 : /usr ;
> }
>
> path-constant ICU_PATH : /usr ;
>
> When i try to apply the patch manualy with patch originalfile <
> patchfile it's working, but when i try it with the externalproject_add
> command:
>
> if(WITH_LIB_BOOST)
> message(STATUS "Build WITH_LIB_BOOST.")
>
> set(LIB_BOOST_INC_PATH ${OUTPUT_PATH}/libs/boost/include/)
> set(LIB_BOOST_LIB_PATH ${OUTPUT_PATH}/libs/boost/lib)
> set(LIB_BOOST_DEPS external_boost)
> set(LIB_BOOST_STATIC_LIBS boost_python27)
>
> ExternalProject_Add(external_boost
> PREFIX ${CMAKE_BINARY_DIR}/boost
> URL ${BOOST_URL}
> DOWNLOAD_DIR ${CMAKE_BINARY_DIR}/boost
> URL_HASH MD5=${BOOST_HASH}
> PATCH_COMMAND /usr/bin/patch
> ${CMAKE_BINARY_DIR}/boost/src/external_boost/project-config.jam <
> ${CMAKE_SOURCE_DIR}/tools/patches/boost_python3.7.patch
> CONFIGURE_COMMAND cd ${CMAKE_BINARY_DIR}/boost/src/external_boost/ &&
> ./bootstrap.sh --prefix=${OUTPUT_PATH}/libs/boost/
> --with-libraries=python
> BUILD_COMMAND cd ${CMAKE_BINARY_DIR}/boost/src/external_boost/ &&
> ./b2
> INSTALL_COMMAND cd ${CMAKE_BINARY_DIR}/boost/src/external_boost/ &&
> ./bjam && ./bjam install
> INSTALL_DIR ${OUTPUT_PATH}/boost
> )
>
> endif()
>
> But when running cmake i get the following output:
>
> patching file
> /home/stuv/projects/programming/bsEdit/build/boost/src/external_boost/project-config.jam
> Hunk #1 FAILED at 18.
>
>
> I have no idea what i'm doing wrong here, i hope someone here can help
> me out.
>
>
> best regards,
>
> Steven Truppe
>
>
>
>
>
--
Powered by www.kitware.com
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Kitware offers various services to support the CMake community. For more
information on each offering, please visit:
CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Follow this link to subscribe/unsubscribe:
https://cmake.org/mailman/listinfo/cmake
[Cmake-commits] CMake branch, master, updated. v3.15.0-337-g52fa25e
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via 52fa25e28f66f043cc7c30717d9298b9a6b8cfa3 (commit)
via 3fb3157dae5427b6c86949ec1603986c57602658 (commit)
from 94b883d9d32cd42c70fa24a90c05116bfc814645 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=52fa25e28f66f043cc7c30717d9298b9a6b8cfa3
commit 52fa25e28f66f043cc7c30717d9298b9a6b8cfa3
Merge: 94b883d 3fb3157
Author: Brad King
AuthorDate: Thu Jul 18 11:07:59 2019 +
Commit: Kitware Robot
CommitDate: Thu Jul 18 07:08:08 2019 -0400
Merge topic 'aix-no-rtl'
3fb3157dae AIX: Do not enable runtime linking by default anymore
Acked-by: Kitware Robot
Merge-request: !3566
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3fb3157dae5427b6c86949ec1603986c57602658
commit 3fb3157dae5427b6c86949ec1603986c57602658
Author: Brad King
AuthorDate: Wed Jul 17 09:20:31 2019 -0400
Commit: Brad King
CommitDate: Wed Jul 17 14:21:37 2019 -0400
AIX: Do not enable runtime linking by default anymore
We've long created shared objects on AIX using the linker's `-G` option
(also offered by the XL front-end). The `-G` option implies `-brtl` and
enables runtime linking. This has been largely unnecessary because we
provide all dependencies on the link line and both XL and GNU compilers
offer builtin behavior to export symbols. Since commit 0f150b69d3 (AIX:
Explicitly compute shared object exports for both XL and GNU,
2019-07-11) we compute exports explicitly and consistently.
Therefore runtime linking is no longer necessary for shared objects.
We've also long created executables on AIX using the linker's `-brtl`
option to enable runtime linking in case they load plugins at runtime.
Since commit 9f5c2040bf (AIX: Explicitly compute executable exports for
both XL and GNU, 2019-07-12) and commit 2fa920c0cd (AIX: Create import
library for executables with exports, 2019-07-16) we now provide the
linker enough information to fully resolve symbols in plugins up front.
Therefore runtime linking is no longer necessary for executables.
Drop use of `-G` for creating shared objects and use the XL `-qmkshrobj`
and GCC `-shared` options instead. Both invoke the linker with the
`-bM:SRE -bnoentry` options to create a shared object without runtime
linking enabled. Also drop use of `-brtl` for creating executables.
Issue: #19163
diff --git a/Help/release/dev/aix.rst b/Help/release/dev/aix.rst
index c24872e..6919358 100644
--- a/Help/release/dev/aix.rst
+++ b/Help/release/dev/aix.rst
@@ -8,3 +8,13 @@ aix
to the executable for its symbols are now linked using the import file.
The :command:`install(TARGETS)` command now installs the import file as
an ``ARCHIVE`` artifact.
+
+* On AIX, runtime linking is no longer enabled by default. CMake provides
+ the linker enough information to resolve all symbols up front.
+ One may manually enable runtime linking for shared libraries and/or
+ loadable modules by adding ``-Wl,-G`` to their link flags
+ (e.g. in the :variable:`CMAKE_SHARED_LINKER_FLAGS` or
+ :variable:`CMAKE_MODULE_LINKER_FLAGS` variable).
+ One may manually enable runtime linking for executables by adding
+ ``-Wl,-brtl`` to their link flags (e.g. in the
+ :variable:`CMAKE_EXE_LINKER_FLAGS` variable).
diff --git a/Modules/Platform/AIX-GNU.cmake b/Modules/Platform/AIX-GNU.cmake
index 9e981c6..61d213a 100644
--- a/Modules/Platform/AIX-GNU.cmake
+++ b/Modules/Platform/AIX-GNU.cmake
@@ -8,16 +8,10 @@ if(__AIX_COMPILER_GNU)
endif()
set(__AIX_COMPILER_GNU 1)
-#
-# By default, runtime linking is enabled. All shared objects specified on the
command line
-# will be listed, even if there are no symbols referenced, in the output file.
-string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " -Wl,-brtl")
-
-
macro(__aix_compiler_gnu lang)
set(CMAKE_SHARED_LIBRARY_RUNTIME_${lang}_FLAG "-Wl,-blibpath:")
set(CMAKE_SHARED_LIBRARY_RUNTIME_${lang}_FLAG_SEP ":")
- string(APPEND CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS " -Wl,-G,-bnoipath")
+ string(APPEND CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS " -Wl,-bnoipath")
set(CMAKE_SHARED_LIBRARY_LINK_${lang}_FLAGS "-Wl,-bexpall") # CMP0065 old
behavior
set(CMAKE_${lang}_USE_IMPLICIT_LINK_DIRECTORIES_IN_RUNTIME_PATH 1)
diff --git a/Modules/Platform/AIX-XL.cmake b/Modules/Platform/AIX-XL.cmake
index 3424e2c..64b0bc1 100644
--- a/Modules/Platform/AIX-XL.cmake
+++ b/Modules/Platform/AIX-XL.cmake
@@ -8,16 +8,10 @@ if(__AIX_COMPILER_XL)
endif()
set(__AIX_COMPILER_XL 1)
-#
-# By
[Cmake-commits] CMake branch, master, updated. v3.15.0-339-gae84427
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via ae84427e3260342aa74aecaad28a27f11fafe569 (commit)
via 696d0f9caf30f7c9f0295ee4bdd696a815eeccdd (commit)
from 52fa25e28f66f043cc7c30717d9298b9a6b8cfa3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ae84427e3260342aa74aecaad28a27f11fafe569
commit ae84427e3260342aa74aecaad28a27f11fafe569
Merge: 52fa25e 696d0f9
Author: Brad King
AuthorDate: Thu Jul 18 11:15:39 2019 +
Commit: Kitware Robot
CommitDate: Thu Jul 18 07:15:48 2019 -0400
Merge topic 'FindPython-interpreter-crosscompiling'
696d0f9caf FindPython: ensure interpreter is founded when cross-compiling
Acked-by: Kitware Robot
Merge-request: !3564
diff --cc Modules/FindPython/Support.cmake
index c0e843a,590c7af..8faec03
--- a/Modules/FindPython/Support.cmake
+++ b/Modules/FindPython/Support.cmake
@@@ -793,9 -641,9 +793,9 @@@ if ("Interpreter" IN_LIST ${_PYTHON_PRE
# For example, typical systems have 'python' for version 2.* and
'python3'
# for version 3.*. So looking for names per dir will find, potentially,
# systematically 'python' (i.e. version 2) even if version 3 is
searched.
- if (WIN32)
+ if (CMAKE_HOST_WIN32)
find_program (${_PYTHON_PREFIX}_EXECUTABLE
- NAMES python${_${_PYTHON_PREFIX}_VERSION}
+ NAMES ${_${_PYTHON_PREFIX}_NAMES}
python
${_${_PYTHON_PREFIX}_IRON_PYTHON_NAMES})
else()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=696d0f9caf30f7c9f0295ee4bdd696a815eeccdd
commit 696d0f9caf30f7c9f0295ee4bdd696a815eeccdd
Author: Marc Chevrier
AuthorDate: Wed Jul 17 18:25:21 2019 +0200
Commit: Brad King
CommitDate: Thu Jul 18 07:13:20 2019 -0400
FindPython: ensure interpreter is founded when cross-compiling
Fixes: #19473
diff --git a/Modules/FindPython/Support.cmake b/Modules/FindPython/Support.cmake
index 49d8e26..590c7af 100644
--- a/Modules/FindPython/Support.cmake
+++ b/Modules/FindPython/Support.cmake
@@ -54,7 +54,7 @@ endmacro()
macro (_PYTHON_FIND_FRAMEWORKS)
set (${_PYTHON_PREFIX}_FRAMEWORKS)
- if (APPLE)
+ if (CMAKE_HOST_APPLE OR APPLE)
set (_pff_frameworks ${CMAKE_FRAMEWORK_PATH}
$ENV{CMAKE_FRAMEWORK_PATH}
~/Library/Frameworks
@@ -483,7 +483,7 @@ if ("Interpreter" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
endif()
# Apple frameworks handling
- if (APPLE AND _${_PYTHON_PREFIX}_FIND_FRAMEWORK STREQUAL "FIRST")
+ if (CMAKE_HOST_APPLE AND _${_PYTHON_PREFIX}_FIND_FRAMEWORK STREQUAL
"FIRST")
find_program (${_PYTHON_PREFIX}_EXECUTABLE
NAMES ${_${_PYTHON_PREFIX}_NAMES}
NAMES_PER_DIR
@@ -500,7 +500,7 @@ if ("Interpreter" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
endif()
endif()
# Windows registry
- if (WIN32 AND _${_PYTHON_PREFIX}_FIND_REGISTRY STREQUAL "FIRST")
+ if (CMAKE_HOST_WIN32 AND _${_PYTHON_PREFIX}_FIND_REGISTRY STREQUAL
"FIRST")
find_program (${_PYTHON_PREFIX}_EXECUTABLE
NAMES ${_${_PYTHON_PREFIX}_NAMES}
${_${_PYTHON_PREFIX}_IRON_PYTHON_NAMES}
@@ -529,7 +529,7 @@ if ("Interpreter" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
endif()
# Apple frameworks handling
- if (APPLE AND _${_PYTHON_PREFIX}_FIND_FRAMEWORK STREQUAL "LAST")
+ if (CMAKE_HOST_APPLE AND _${_PYTHON_PREFIX}_FIND_FRAMEWORK STREQUAL
"LAST")
find_program (${_PYTHON_PREFIX}_EXECUTABLE
NAMES ${_${_PYTHON_PREFIX}_NAMES}
NAMES_PER_DIR
@@ -542,7 +542,7 @@ if ("Interpreter" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
endif()
endif()
# Windows registry
- if (WIN32 AND _${_PYTHON_PREFIX}_FIND_REGISTRY STREQUAL "LAST")
+ if (CMAKE_HOST_WIN32 AND _${_PYTHON_PREFIX}_FIND_REGISTRY STREQUAL
"LAST")
find_program (${_PYTHON_PREFIX}_EXECUTABLE
NAMES ${_${_PYTHON_PREFIX}_NAMES}
${_${_PYTHON_PREFIX}_IRON_PYTHON_NAMES}
@@ -591,7 +591,7 @@ if ("Interpreter" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
endif()
# Apple frameworks handling
- if (APPLE AND _${_PYTHON_PREFIX}_FIND_FRAMEWORK STREQUAL "FIRST")
+ if (CMAKE_HOST_APPLE AND _${_PYTHON_PREFIX}_FIND_FRAMEWORK STREQUAL
"FIRST")
find_program (${_PYTHON_PREFIX}_EXECUTABLE
NAMES
[Cmake-commits] CMake branch, release, updated. v3.15.0-2-gc790324
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake". The branch, release has been updated via c79032438c5f90ca957b1a02886e60835d5d6e47 (commit) via 696d0f9caf30f7c9f0295ee4bdd696a815eeccdd (commit) from 79bcf4e1655ffa38e8f4740b19ec3a14ac567eec (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - --- Summary of changes: Modules/FindPython/Support.cmake | 21 ++--- 1 file changed, 10 insertions(+), 11 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.15.0-348-gd59716d
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via d59716d907dc6f5d28ee28829763cf1906505721 (commit)
via f19c189e74a685c9f2fa5ffdca159e75f6f5be5c (commit)
via 0a3dd07fb6b26694c46c5a23cf19d7f4641d91d3 (commit)
via c79032438c5f90ca957b1a02886e60835d5d6e47 (commit)
via 5803a8a2f7e0894810e9bd2e8c433dce7346cf76 (commit)
via 47e28cbe1faf7b70bda0d7d88db1d146d69a0123 (commit)
via 6814567e8c1c73c09e98ebcd1296e4fda717f0a4 (commit)
via c8741e8ff5ed93467812378413f1b3338c0ee6b2 (commit)
via be0d4042082db4dcd263dd181570b6f406202ed9 (commit)
from ae84427e3260342aa74aecaad28a27f11fafe569 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d59716d907dc6f5d28ee28829763cf1906505721
commit d59716d907dc6f5d28ee28829763cf1906505721
Merge: 0a3dd07 f19c189
Author: Brad King
AuthorDate: Thu Jul 18 11:50:33 2019 +
Commit: Kitware Robot
CommitDate: Thu Jul 18 07:50:40 2019 -0400
Merge topic 'swift-improvements'
f19c189e74 Merge branch 'backport-swift-improvements' into
swift-improvements
5803a8a2f7 Swift: support SONAME on ELFish targets
47e28cbe1f Swift: support multithreaded compilation
6814567e8c Swift: add rules for static linking
c8741e8ff5 Swift: Add library search paths for dependencies
be0d404208 Support per-language library link flags
Acked-by: Kitware Robot
Merge-request: !3568
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f19c189e74a685c9f2fa5ffdca159e75f6f5be5c
commit f19c189e74a685c9f2fa5ffdca159e75f6f5be5c
Merge: 0a3dd07 5803a8a
Author: Brad King
AuthorDate: Thu Jul 18 07:46:42 2019 -0400
Commit: Brad King
CommitDate: Thu Jul 18 07:46:42 2019 -0400
Merge branch 'backport-swift-improvements' into swift-improvements
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0a3dd07fb6b26694c46c5a23cf19d7f4641d91d3
commit 0a3dd07fb6b26694c46c5a23cf19d7f4641d91d3
Merge: ae84427 c790324
Author: Brad King
AuthorDate: Thu Jul 18 07:43:40 2019 -0400
Commit: Brad King
CommitDate: Thu Jul 18 07:43:40 2019 -0400
Merge branch 'release-3.15'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5803a8a2f7e0894810e9bd2e8c433dce7346cf76
commit 5803a8a2f7e0894810e9bd2e8c433dce7346cf76
Author: Saleem Abdulrasool
AuthorDate: Thu Jul 11 11:12:26 2019 -0700
Commit: Saleem Abdulrasool
CommitDate: Wed Jul 17 20:46:25 2019 -0700
Swift: support SONAME on ELFish targets
We should enable the soname to be setup for ELF shared libraries.
Failure to do so generates binaries with incorrect names which prevents
loading.
diff --git a/Modules/CMakeSwiftInformation.cmake
b/Modules/CMakeSwiftInformation.cmake
index 0f84cce..f6510b9 100644
--- a/Modules/CMakeSwiftInformation.cmake
+++ b/Modules/CMakeSwiftInformation.cmake
@@ -18,6 +18,9 @@ if(CMAKE_Swift_COMPILER_ID)
endif()
set(CMAKE_INCLUDE_FLAG_Swift "-I ")
+if(NOT CMAKE_SYSTEM_NAME STREQUAL Windows AND NOT CMAKE_SYSTEM_NAME STREQUAL
Darwin)
+ set(CMAKE_SHARED_LIBRARY_SONAME_Swift_FLAG "-Xlinker -soname -Xlinker ")
+endif()
set(CMAKE_Swift_COMPILE_OPTIONS_TARGET "-target ")
set(CMAKE_Swift_COMPILER_ARG1 -frontend)
@@ -55,9 +58,9 @@ endif()
if(NOT CMAKE_Swift_CREATE_SHARED_LIBRARY)
if(CMAKE_Swift_COMPILER_TARGET)
-set(CMAKE_Swift_CREATE_SHARED_LIBRARY "${CMAKE_Swift_COMPILER} -target
-output-file-map
-incremental -num-threads ${CMAKE_Swift_NUM_THREADS} -emit-library -o
-module-name -module-link-name
-emit-module -emit-module-path -emit-dependencies
")
+set(CMAKE_Swift_CREATE_SHARED_LIBRARY "${CMAKE_Swift_COMPILER} -target
-output-file-map
-incremental -num-threads ${CMAKE_Swift_NUM_THREADS} -emit-library -o
-module-name -module-link-name
-emit-module -emit-module-path -emit-dependencies
")
else()
-set(CMAKE_Swift_CREATE_SHARED_LIBRARY "${CMAKE_Swift_COMPILER}
-output-file-map -incremental -num-threads
${CMAKE_Swift_NUM_THREADS} -emit-library -o -module-name
-module-link-name -emit-module
-emit-module-path -emit-dependencies
")
+set(CMAKE_Swift_CREATE_SHARED_LIBRARY "${CMAKE_Swift_COMPILER}
-output-file-map -incremental -num-threads
${CMAKE_Swift_NUM_THREADS} -emit-library -o -module-name
-module-link-name -emit-module
-emit-module-path -emit-dependencies
")
endif()
endif()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=47e28cbe1faf7b70bda0d7d88db1d146d69a0123
commit 47e28cbe1faf7b70bda0d7d88db1d146d69a0123
Author: Saleem Abdulrasool
AuthorDate: Sun Jun 30 20:50:08 2019 -0700
Commit:
[Cmake-commits] CMake branch, master, updated. v3.15.0-350-ge3bd5c5
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake". The branch, master has been updated via e3bd5c5b666e515319d81f8218e2f71c11169304 (commit) via 1a2d260634807682a94aee140e77d52168f10ba6 (commit) from d59716d907dc6f5d28ee28829763cf1906505721 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e3bd5c5b666e515319d81f8218e2f71c11169304 commit e3bd5c5b666e515319d81f8218e2f71c11169304 Merge: d59716d 1a2d260 Author: Brad King AuthorDate: Thu Jul 18 07:53:06 2019 -0400 Commit: Brad King CommitDate: Thu Jul 18 07:53:06 2019 -0400 Merge branch 'release-3.15' --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, release, updated. v3.15.0-8-g1a2d260
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake". The branch, release has been updated via 1a2d260634807682a94aee140e77d52168f10ba6 (commit) via 5803a8a2f7e0894810e9bd2e8c433dce7346cf76 (commit) via 47e28cbe1faf7b70bda0d7d88db1d146d69a0123 (commit) via 6814567e8c1c73c09e98ebcd1296e4fda717f0a4 (commit) via c8741e8ff5ed93467812378413f1b3338c0ee6b2 (commit) via be0d4042082db4dcd263dd181570b6f406202ed9 (commit) from c79032438c5f90ca957b1a02886e60835d5d6e47 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - --- Summary of changes: Help/manual/cmake-variables.7.rst | 1 + Help/variable/CMAKE_Swift_NUM_THREADS.rst | 8 Modules/CMakeSwiftInformation.cmake | 23 + Source/cmLinkLineComputer.cxx | 34 --- Source/cmLocalGenerator.cxx | 21 +++ 5 files changed, 72 insertions(+), 15 deletions(-) create mode 100644 Help/variable/CMAKE_Swift_NUM_THREADS.rst hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.15.0-351-gac000e2
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake". The branch, master has been updated via ac000e29da89eec74fc106fc41c48a098f8ff971 (commit) from e3bd5c5b666e515319d81f8218e2f71c11169304 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ac000e29da89eec74fc106fc41c48a098f8ff971 commit ac000e29da89eec74fc106fc41c48a098f8ff971 Author: Kitware Robot AuthorDate: Fri Jul 19 00:01:07 2019 -0400 Commit: Kitware Robot CommitDate: Fri Jul 19 00:01:07 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index a9ce61a..cf21839 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 15) -set(CMake_VERSION_PATCH 20190718) +set(CMake_VERSION_PATCH 20190719) #set(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
