[Cmake-commits] CMake branch, master, updated. v3.15.3-949-gf545428
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 f545428be08531d2561feba4854793775be83c39 (commit) from ee15bc7d7e7707fd8d7db92645c2c56a5df0f681 (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=f545428be08531d2561feba4854793775be83c39 commit f545428be08531d2561feba4854793775be83c39 Author: Kitware Robot AuthorDate: Thu Sep 5 00:01:06 2019 -0400 Commit: Kitware Robot CommitDate: Thu Sep 5 00:01:06 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 5f6e9bb..545b0a9 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 15) -set(CMake_VERSION_PATCH 20190904) +set(CMake_VERSION_PATCH 20190905) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) --- 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
Re: [CMake] The connection to cmake-server was terminated unexpectedly [cms-client] cmake-server exited with status null (SIGSEGV)
Awesome thank you so much! So i’ve upgraded to 3.15.3 and it’s told me
perfectly my issue. So I have an override script (FindLibXml2.cmake):
*** START CODE ***
# FindLibXml2.cmake
#
# A wrapper around CMake's FindLibXml2 which provides an imported target.
# Find LibXml2 using the built-in module
set(_cmake_module_path "${CMAKE_MODULE_PATH}")
set(CMAKE_MODULE_PATH)
include(FindLibXml2)
set(CMAKE_MODULE_PATH "${_cmake_module_path}")
if(LibXml2_FOUND AND NOT TARGET LibXml2::LibXml2)
add_library(LibXml2::LibXml2 INTERFACE IMPORTED)
set_target_properties(LibXml2::LibXml2 PROPERTIES
INTERFACE_LINK_LIBRARIES "${LIBXML2_LIBRARIES}"
INTERFACE_INCLUDE_DIRECTORIES "${LIBXML2_INCLUDE_DIR}")
else()
#https://github.com/Homebrew/homebrew-core/issues/6186
if(APPLE)
get_target_property(id LibXml2::LibXml2 INTERFACE_INCLUDE_DIRECTORIES)
list(REMOVE_ITEM id "/usr/include/libxml2")
set_target_properties(LibXml2::LibXml2 PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${id}")
endif()
endif()
*** END CODE ***
So the issue was:
set(CMAKE_MODULE_PATH)
doesn’t work in cmake-server; also unset(CMAKE_MODULE_PATH) didn’t work either,
when i do:
set(CMAKE_MODULE_PATH “/nonexistent”)
it all comes good; for some reason i think unset isn’t quite happy on
cmake-server.
Many thanks again for your quick response!
Christopher Dawes
Principal Architect, EFTLab
M: +44 (0)7899 842 759
E: christopher.da...@eftlab.com
A: 109 Brighton Road, Sandgate, QLD 4017
IMPORTANT NOTICE
This message contains confidential information and is intended only for the
addressee(s). E-mail transmission cannot be guaranteed to be secure or
error-free as information could be intercepted, corrupted, lost, destroyed,
arrive late or incomplete, or contain viruses. EFTlab Pty Ltd cannot accept
liability for any errors or omissions in the contents of this message, which
may arise as a result of e-mail transmission. Please note that EFTlab Pty Ltd
may monitor, analyse and archive email traffic, data and the content of email
for the purposes of security, legal compliance and staff training. If you have
received this email in error please notify us at
supp...@eftlab.com.au.
On 4 Sep 2019, at 19:39, Kyle Edwards via CMake
mailto:cmake@cmake.org>> wrote:
On Wed, 2019-09-04 at 14:12 -0400, fdk17 wrote:
https://github.com/microsoft/vscode-cmake-tools/issues/752 states
that it ran out of stack and the log shows what looks like to be
involved with a recursive loop in some CMakeLists.txt. A call depth
of 27491 seems a bit excessive.
After the second call to FindPackage it just seems to be doing the
same thing over and over again.
I'd think a newer version of CMake would complain about too much
recursion in the project files.
Indeed, this was added in 3.14:
https://cmake.org/cmake/help/v3.14/variable/CMAKE_MAXIMUM_RECURSION_DEP
TH.html
Kyle
--
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
--
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] The connection to cmake-server was terminated unexpectedly [cms-client] cmake-server exited with status null (SIGSEGV)
On Thu, Sep 5, 2019 at 7:56 AM Christopher Dawes <
christopher.da...@eftlab.com> wrote:
> Awesome thank you so much! So i’ve upgraded to 3.15.3 and it’s told me
> perfectly my issue. So I have an override script (FindLibXml2.cmake):
>
> *** START CODE ***
> # FindLibXml2.cmake
> #
> # A wrapper around CMake's FindLibXml2 which provides an imported target.
>
> # Find LibXml2 using the built-in module
> set(_cmake_module_path "${CMAKE_MODULE_PATH}")
> set(CMAKE_MODULE_PATH)
> include(FindLibXml2)
> set(CMAKE_MODULE_PATH "${_cmake_module_path}")
>
> if(LibXml2_FOUND AND NOT TARGET LibXml2::LibXml2)
> add_library(LibXml2::LibXml2 INTERFACE IMPORTED)
> set_target_properties(LibXml2::LibXml2 PROPERTIES
> INTERFACE_LINK_LIBRARIES "${LIBXML2_LIBRARIES}"
> INTERFACE_INCLUDE_DIRECTORIES "${LIBXML2_INCLUDE_DIR}")
> else()
> #https://github.com/Homebrew/homebrew-core/issues/6186
> if(APPLE)
> get_target_property(id LibXml2::LibXml2 INTERFACE_INCLUDE_DIRECTORIES)
> list(REMOVE_ITEM id "/usr/include/libxml2")
> set_target_properties(LibXml2::LibXml2 PROPERTIES
> INTERFACE_INCLUDE_DIRECTORIES "${id}")
> endif()
> endif()
>
> *** END CODE ***
>
> So the issue was:
> set(CMAKE_MODULE_PATH)
>
> doesn’t work in cmake-server; also unset(CMAKE_MODULE_PATH) didn’t work
> either, when i do:
>
> set(CMAKE_MODULE_PATH “/nonexistent”)
>
> it all comes good; for some reason i think unset isn’t quite happy on
> cmake-server.
>
Check that you don't also have a CMAKE_MODULE_PATH cache variable as well.
If you unset the non-cache variable, it will effectively unmask the cache
variable of the same name.
> Many thanks again for your quick response!
>
> *Christopher Dawes*
> *Principal Architect, EFTLab*
>
> *M:* +44 (0)7899 842 759
> *E:* christopher.da...@eftlab.com
> *A:* 109 Brighton Road, Sandgate, QLD 4017
>
> *IMPORTANT NOTICE*
> This message contains confidential information and is intended only for
> the addressee(s). E-mail transmission cannot be guaranteed to be secure or
> error-free as information could be intercepted, corrupted, lost, destroyed,
> arrive late or incomplete, or contain viruses. EFTlab Pty Ltd cannot accept
> liability for any errors or omissions in the contents of this message,
> which may arise as a result of e-mail transmission. Please note that EFTlab
> Pty Ltd may monitor, analyse and archive email traffic, data and the
> content of email for the purposes of security, legal compliance and staff
> training. If you have received this email in error please notify us at
> supp...@eftlab.com.au.
>
> On 4 Sep 2019, at 19:39, Kyle Edwards via CMake wrote:
>
> On Wed, 2019-09-04 at 14:12 -0400, fdk17 wrote:
>
> https://github.com/microsoft/vscode-cmake-tools/issues/752 states
> that it ran out of stack and the log shows what looks like to be
> involved with a recursive loop in some CMakeLists.txt. A call depth
> of 27491 seems a bit excessive.
>
> After the second call to FindPackage it just seems to be doing the
> same thing over and over again.
> I'd think a newer version of CMake would complain about too much
> recursion in the project files.
>
>
> Indeed, this was added in 3.14:
>
> https://cmake.org/cmake/help/v3.14/variable/CMAKE_MAXIMUM_RECURSION_DEP
> TH.html
> Kyle
> --
>
> 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
>
>
> --
>
> 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
>
--
Craig Scott
Melbourne, Australia
https://crascit.com
Get the hand-book for every CMake user: Professional CMake: A Practical
Guide
Re: [CMake] The connection to cmake-server was terminated unexpectedly [cms-client] cmake-server exited with status null (SIGSEGV)
On Wed, 2019-09-04 at 14:12 -0400, fdk17 wrote: > https://github.com/microsoft/vscode-cmake-tools/issues/752 states > that it ran out of stack and the log shows what looks like to be > involved with a recursive loop in some CMakeLists.txt. A call depth > of 27491 seems a bit excessive. > > After the second call to FindPackage it just seems to be doing the > same thing over and over again. > I'd think a newer version of CMake would complain about too much > recursion in the project files. Indeed, this was added in 3.14: https://cmake.org/cmake/help/v3.14/variable/CMAKE_MAXIMUM_RECURSION_DEP TH.html Kyle -- 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] The connection to cmake-server was terminated unexpectedly [cms-client] cmake-server exited with status null (SIGSEGV)
https://github.com/microsoft/vscode-cmake-tools/issues/752 states that it ran
out of stack and the log shows what looks like to be involved with a recursive
loop in some CMakeLists.txt. A call depth of 27491 seems a bit excessive.
After the second call to FindPackage it just seems to be doing the same thing
over and over again.
I'd think a newer version of CMake would complain about too much recursion in
the project files.
Does the project work on the command line without involving VSCode?
It could be something different in the environment if it works on the command
line but not as server instance in VSCode.
--
F
On Wed, Sep 4, 2019, at 12:22 PM, Christopher Dawes wrote:
> Hi there, we are experiencing a crash when working with VSCode on Ubuntu:
>
> Brief Issue Summary
> When starting up VSCode using the CMake extension i get this error on all my
> projects, the application terminates pretty quickly. What’s happening is
> cmake server is spawned and then crashes; i’m afraid i’m uncertain what
> commands are exchanged. I logged the issue against the cmake extension here
> https://github.com/microsoft/vscode-cmake-tools/issues/752 however it looks
> like the issue is with cmake rather than the way it’s being used.
> Platform and Versions
> * Operating System: Ubuntu 18.04
> * CMake Version: 3.10.2
> * VSCode Version: 1.37.1
> * CMake Tools Extension Version: 1.13
> * Compiler/Toolchain: GCC 7.4.0-1ubuntu1~18.04.1 with Ninja
> Other Notes/Information
> I've run with debug symbols however it's too big (33MB) to attach here, see
> https://www.dropbox.com/s/cl7z4cxd5oyuvbr/with_symbols.txt?dl=0
> Here's a small excerpt:
> Thread 1 (Thread 0x7fce40c3a780 (LWP 28685)):
#0 std::__cxx11::basic_string, std::allocator >::_M_length (this=, __length=)
at /usr/include/c++/7/bits/basic_string.h:172
No locals.
#1 std::__cxx11::basic_string, std::allocator >::_M_set_length (__n=, this=)
at /usr/include/c++/7/bits/basic_string.h:205
No locals.
#2 std::__cxx11::basic_string, std::allocator >::basic_string
(this=0x7ffdee7d5e40) at /usr/include/c++/7/bits/basic_string.h:423
No locals.
#3 cmsys::SystemTools::FileIsDirectory (inName=...) at
./Source/kwsys/SystemTools.cxx:2865
length =
name =
local_buffer =
string_buffer =
last =
fs =
#4 0x55d2c7efa231 in cmListFile::ParseFile
(this=this@entry=0x7ffdee7d7010, filename=0x55d2ca803700
"/usr/local/bp/share/cmake/FindLibXml2.cmake", messenger=0x55d2c8da6110,
lfbt=...) at ./Source/cmListFileCache.cxx:139
parseError =
#5 0x55d2c7ca8c63 in cmMakefile::ReadDependentFile (this=0x55d2c8e139a0,
filename=, noPolicyScope=noPolicyScope@entry=false) at
./Source/cmMakefile.cxx:444
filenametoread = {static npos = 18446744073709551615, _M_dataplus = {>
= {<__gnu_cxx::new_allocator> = {}, }, _M_p = 0x55d2ca803700
"/usr/local/bp/share/cmake/FindLibXml2.cmake"}, _M_string_length = 43,
{_M_local_buf = "-\000\000\000\000\000\000\000\v\000\000\000\000\000\000",
_M_allocated_capacity = 45}}
incScope = {Makefile = 0x55d2c8e139a0, NoPolicyScope = false,
CheckCMP0011 = false, ReportError = true}
listFile = {Functions = { >> = {_M_impl = {> =
{<__gnu_cxx::new_allocator> = {}, }, _M_start = 0x0, _M_finish = 0x0,
_M_end_of_storage = 0x0}}, }}
#6 0x55d2c7d8e3bb in cmIncludeCommand::InitialPass (this=0x55d2ca8034c0,
args=...) at ./Source/cmIncludeCommand.cxx:123
readit =
optional =
noPolicyScope =
fname = {static npos = 18446744073709551615, _M_dataplus = {> =
{<__gnu_cxx::new_allocator> = {}, }, _M_p = 0x55d2ca803640
"/usr/local/bp/share/cmake/FindLibXml2.cmake"}, _M_string_length = 43,
{_M_local_buf = "+\000\000\000\000\000\000\000ml2\000\000\000\000",
_M_allocated_capacity = 43}}
resultVarName = {static npos = 18446744073709551615, _M_dataplus = {> =
{<__gnu_cxx::new_allocator> = {}, }, _M_p = 0x7ffdee7d7120 ""},
_M_string_length = 0, {_M_local_buf =
"\000\000\000\000[\000\000\000Pc\357\310\322U\000", _M_allocated_capacity =
390842023936}}
fname_abs = {static npos = 18446744073709551615, _M_dataplus = {> =
{<__gnu_cxx::new_allocator> = {}, }, _M_p = 0x55d2ca803560
"/usr/local/bp/share/cmake/FindLibXml2.cmake"}, _M_string_length = 43,
{_M_local_buf = "-\000\000\000\000\000\000\000`5\200\312\322U\000",
_M_allocated_capacity = 45}}
gg = 0x55d2c8df16a0
listFile = {static npos = 18446744073709551615, _M_dataplus = {> =
{<__gnu_cxx::new_allocator> = {}, }, _M_p = 0x55d2ca803680
"/usr/local/bp/share/cmake/FindLibXml2.cmake"}, _M_string_length = 43,
{_M_local_buf = "-", '\000' , _M_allocated_capacity = 45}}
#7 0x55d2c7d2709c in cmCommand::InvokeInitialPass (this=0x55d2ca8034c0,
args=..., status=...) at ./Source/cmCommand.cxx:19
expandedArguments = {, std::allocator >, std::allocator, std::allocator
> > >> = {_M_impl = {, std::allocator > >> = {<__gnu_cxx::new_allocator,
[CMake] The connection to cmake-server was terminated unexpectedly [cms-client] cmake-server exited with status null (SIGSEGV)
Hi there, we are experiencing a crash when working with VSCode on Ubuntu:
Brief Issue Summary
When starting up VSCode using the CMake extension i get this error on all my
projects, the application terminates pretty quickly. What’s happening is cmake
server is spawned and then crashes; i’m afraid i’m uncertain what commands are
exchanged. I logged the issue against the cmake extension here
https://github.com/microsoft/vscode-cmake-tools/issues/752 however it looks
like the issue is with cmake rather than the way it’s being used.
Platform and Versions
* Operating System: Ubuntu 18.04
* CMake Version: 3.10.2
* VSCode Version: 1.37.1
* CMake Tools Extension Version: 1.13
* Compiler/Toolchain: GCC 7.4.0-1ubuntu1~18.04.1 with Ninja
Other Notes/Information
I've run with debug symbols however it's too big (33MB) to attach here, see
https://www.dropbox.com/s/cl7z4cxd5oyuvbr/with_symbols.txt?dl=0
Here's a small excerpt:
Thread 1 (Thread 0x7fce40c3a780 (LWP 28685)):
#0 std::__cxx11::basic_string, std::allocator >::_M_length (this=, __length=)
at /usr/include/c++/7/bits/basic_string.h:172
No locals.
#1 std::__cxx11::basic_string, std::allocator >::_M_set_length (__n=, this=)
at /usr/include/c++/7/bits/basic_string.h:205
No locals.
#2 std::__cxx11::basic_string, std::allocator >::basic_string
(this=0x7ffdee7d5e40) at /usr/include/c++/7/bits/basic_string.h:423
No locals.
#3 cmsys::SystemTools::FileIsDirectory (inName=...) at
./Source/kwsys/SystemTools.cxx:2865
length =
name =
local_buffer =
string_buffer =
last =
fs =
#4 0x55d2c7efa231 in cmListFile::ParseFile
(this=this@entry=0x7ffdee7d7010, filename=0x55d2ca803700
"/usr/local/bp/share/cmake/FindLibXml2.cmake", messenger=0x55d2c8da6110,
lfbt=...) at ./Source/cmListFileCache.cxx:139
parseError =
#5 0x55d2c7ca8c63 in cmMakefile::ReadDependentFile (this=0x55d2c8e139a0,
filename=, noPolicyScope=noPolicyScope@entry=false) at
./Source/cmMakefile.cxx:444
filenametoread = {static npos = 18446744073709551615, _M_dataplus = {>
= {<__gnu_cxx::new_allocator> = {}, }, _M_p = 0x55d2ca803700
"/usr/local/bp/share/cmake/FindLibXml2.cmake"}, _M_string_length = 43,
{_M_local_buf = "-\000\000\000\000\000\000\000\v\000\000\000\000\000\000",
_M_allocated_capacity = 45}}
incScope = {Makefile = 0x55d2c8e139a0, NoPolicyScope = false,
CheckCMP0011 = false, ReportError = true}
listFile = {Functions = { >> = {_M_impl = {> =
{<__gnu_cxx::new_allocator> = {}, }, _M_start = 0x0, _M_finish = 0x0,
_M_end_of_storage = 0x0}}, }}
#6 0x55d2c7d8e3bb in cmIncludeCommand::InitialPass (this=0x55d2ca8034c0,
args=...) at ./Source/cmIncludeCommand.cxx:123
readit =
optional =
noPolicyScope =
fname = {static npos = 18446744073709551615, _M_dataplus = {> =
{<__gnu_cxx::new_allocator> = {}, }, _M_p = 0x55d2ca803640
"/usr/local/bp/share/cmake/FindLibXml2.cmake"}, _M_string_length = 43,
{_M_local_buf = "+\000\000\000\000\000\000\000ml2\000\000\000\000",
_M_allocated_capacity = 43}}
resultVarName = {static npos = 18446744073709551615, _M_dataplus = {> =
{<__gnu_cxx::new_allocator> = {}, }, _M_p = 0x7ffdee7d7120 ""},
_M_string_length = 0, {_M_local_buf =
"\000\000\000\000[\000\000\000Pc\357\310\322U\000", _M_allocated_capacity =
390842023936}}
fname_abs = {static npos = 18446744073709551615, _M_dataplus = {> =
{<__gnu_cxx::new_allocator> = {}, }, _M_p = 0x55d2ca803560
"/usr/local/bp/share/cmake/FindLibXml2.cmake"}, _M_string_length = 43,
{_M_local_buf = "-\000\000\000\000\000\000\000`5\200\312\322U\000",
_M_allocated_capacity = 45}}
gg = 0x55d2c8df16a0
listFile = {static npos = 18446744073709551615, _M_dataplus = {> =
{<__gnu_cxx::new_allocator> = {}, }, _M_p = 0x55d2ca803680
"/usr/local/bp/share/cmake/FindLibXml2.cmake"}, _M_string_length = 43,
{_M_local_buf = "-", '\000' , _M_allocated_capacity = 45}}
#7 0x55d2c7d2709c in cmCommand::InvokeInitialPass (this=0x55d2ca8034c0,
args=..., status=...) at ./Source/cmCommand.cxx:19
expandedArguments = {, std::allocator >, std::allocator, std::allocator
> > >> = {_M_impl = {, std::allocator > >> = {<__gnu_cxx::new_allocator,
std::allocator > >> = {}, }, _M_start = 0x55d2ca8013a0, _M_finish =
0x55d2ca8013c0, _M_end_of_storage = 0x55d2ca8013c0}}, }
#8 0x55d2c7ca7326 in cmMakefile::ExecuteCommand
(this=this@entry=0x55d2c8e139a0, lff=..., status=...) at
./Source/cmMakefile.cxx:277
invokeSucceeded =
hadNestedError =
pcmd = {_M_t = {_M_t = { >> = { >> = {, true>> = {> = {}, }, }, > =
{_M_head_impl = 0x55d2ca8034c0}, }, }}}
proto =
result = true
name = {static npos = 18446744073709551615, _M_dataplus = {> =
{<__gnu_cxx::new_allocator> = {}, }, _M_p = 0x7ffdee7d7400 "include"},
_M_string_length = 7, {_M_local_buf = "include\000p\205\336\310\322U\000",
_M_allocated_capacity =
[cmake-developers] [ANNOUNCE] CMake 3.15.3 available for download
We are pleased to announce that CMake 3.15.3 is now available for download. Please use the latest release from our download page: https://cmake.org/download/ Thanks for your support! - Changes in 3.15.3 since 3.15.2: Brad King (13): Flang: Implement MSVC runtime library abstraction CTest: Fix --show-only=json-v1 output with REQUIRED_FILES property cmGlobalGenerator: Fix CheckCompilerIdCompatibility local var lifetime cmAffinity: Add include for CPU_ZERO on Alpine Linux find_path: Fix crash on empty old-style list of names fileapi: Fix codemodel v2 target file name for CMP0037 OLD behavior FindBoost: Simplify conditional block for last known version FindBoost: Remove incorrect 1.70 timer dependency FindBoost: Unwrap compatibility INTERFACE targets for legacy variables FindBoost: Add support for Boost 1.71 FindBoost: Clarify role of legacy variables in warning message FindBoost: Tolerate future Boost INTERFACE libraries CMake 3.15.3 Chuck Atkins (1): CrayPrgEnv: Change default linking mode based on PE version M Furkan USLU (1): ccmake: handle cache entries with empty STRINGS property Marvin Schmidt (1): libarchive: We now require at least version 3.3.3 Robert Maynard (1): FindMPI: Restore MPI__COMPILE_FLAGS and MPI__COMPILE_OPTIONS Sebastian Holtermann (3): Ninja: Add support for ADDITIONAL_CLEAN_FILES in custom targets Tests: Extend MakeClean test to test various target types Autogen: Fix AUTOUIC segfault, when file includes colliding ui_*.h file -- 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-developers
[CMake] [ANNOUNCE] CMake 3.15.3 available for download
We are pleased to announce that CMake 3.15.3 is now available for download. Please use the latest release from our download page: https://cmake.org/download/ Thanks for your support! - Changes in 3.15.3 since 3.15.2: Brad King (13): Flang: Implement MSVC runtime library abstraction CTest: Fix --show-only=json-v1 output with REQUIRED_FILES property cmGlobalGenerator: Fix CheckCompilerIdCompatibility local var lifetime cmAffinity: Add include for CPU_ZERO on Alpine Linux find_path: Fix crash on empty old-style list of names fileapi: Fix codemodel v2 target file name for CMP0037 OLD behavior FindBoost: Simplify conditional block for last known version FindBoost: Remove incorrect 1.70 timer dependency FindBoost: Unwrap compatibility INTERFACE targets for legacy variables FindBoost: Add support for Boost 1.71 FindBoost: Clarify role of legacy variables in warning message FindBoost: Tolerate future Boost INTERFACE libraries CMake 3.15.3 Chuck Atkins (1): CrayPrgEnv: Change default linking mode based on PE version M Furkan USLU (1): ccmake: handle cache entries with empty STRINGS property Marvin Schmidt (1): libarchive: We now require at least version 3.3.3 Robert Maynard (1): FindMPI: Restore MPI__COMPILE_FLAGS and MPI__COMPILE_OPTIONS Sebastian Holtermann (3): Ninja: Add support for ADDITIONAL_CLEAN_FILES in custom targets Tests: Extend MakeClean test to test various target types Autogen: Fix AUTOUIC segfault, when file includes colliding ui_*.h file -- 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 annotated tag, v3.15.3, created. v3.15.3
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 annotated tag, v3.15.3 has been created at 842f4e2244ec87b814624c97be6456b3d68d3f6c (tag) tagging 26a0e200e5f4abe8268235c9fdb23a2612a1b3b1 (commit) replaces v3.15.2 tagged by Brad King on Wed Sep 4 10:56:34 2019 -0400 - Log - CMake 3.15.3 -BEGIN PGP SIGNATURE- iQJKBAABCgA0FiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAl1v0KIWHGJyYWQua2lu Z0BraXR3YXJlLmNvbQAKCRAtLO8QNJIWhJf0D/9unhBq9FGp2DD/kjXBfJFmMkyC ABguTSYX/guCHDHTMlBQx01r+fllpAihFg8m/XrU3fOuBJRLHHbMEn5WR9EmXaRq UgKYfc5f0B2DUf0bFAf1v0QLtpZgleipd26wOSloWjs94tBn6o9IV2UdBpxs9b5U Ay7IG7DPuJqFRqocuZVC9iS/H0uZ6n8kg/0patgqL2hv/wE9KVPIZAng9TVQA5hz tQEv419gpvRqA3Wgpoj/+oFgS3EcrVymaIQKE478cqnVd5WmdoP84lnDYbC7DCXe IjBlGbNPo1CTTzQ6glvzmanWRFe4fgmMrJ/nSOS09h78DZMUyPTrbTpctb3s/7e1 tvbejZgrrH+R3TJvNh4ZR2l05g3Vy9m2HQYUaPXP1viGQD3u6ymXCUqx/iQt19CG xGZFXqQR5IRAozjrZ6KNgJ/UG1ZwXwBhPeW4XNSBE/PRXoW4U8tGvwou7gCnZORg 1i7I1ABweIaU0mwk8LF3++Hv5vkcj9LsiC7TgCW8xjEhVbONTwsuUpkAXTz2VtKq Ekgk0+p5vXsiiSpUvnCOPFURk2eDJVhVXOlsY8ybnQ6ae8Ewwgoxk+W+Oa2aZ8B2 45STj193kGoWzXboBHGeIulHnvmmrxkwoXwun+oNIZm5Hc0s4n9a2ZHgpngUx+lo idvR++raJrI7BAc1Ww== =gzq0 -END PGP SIGNATURE- Brad King (27): Flang: Implement MSVC runtime library abstraction Merge branch 'msvc-runtime-library-flang' into release-3.15 Merge branch 'ccmake-crash-on-empty-strings-property' into release-3.15 Merge branch 'FindMPI-restore-flag-vars' into release-3.15 Merge branch 'CrayPrgEnv-update-link-type-detection' into release-3.15 CTest: Fix --show-only=json-v1 output with REQUIRED_FILES property Merge branch 'ctest-json-REQUIRED_FILES' into release-3.15 cmGlobalGenerator: Fix CheckCompilerIdCompatibility local var lifetime cmAffinity: Add include for CPU_ZERO on Alpine Linux Merge branch 'ninja_additional_clean_files_custom_target' into release-3.15 Merge branch 'libarchive-requirement' into release-3.15 Merge branch 'cmGlobalGenerator-compilerId-lifetime' into release-3.15 Merge branch 'alpine-cpu_zero' into release-3.15 Merge branch 'autogen_fix_use_after_move' into release-3.15 find_path: Fix crash on empty old-style list of names Merge branch 'backport-find-no-name' into release-3.15 fileapi: Fix codemodel v2 target file name for CMP0037 OLD behavior Merge branch 'fileapi-CMP0037-OLD' into release-3.15 FindBoost: Simplify conditional block for last known version FindBoost: Remove incorrect 1.70 timer dependency FindBoost: Unwrap compatibility INTERFACE targets for legacy variables FindBoost: Add support for Boost 1.71 Merge branch 'FindBoost-1.71' into release-3.15 FindBoost: Clarify role of legacy variables in warning message FindBoost: Tolerate future Boost INTERFACE libraries Merge branch 'FindBoost-1.71' into release-3.15 CMake 3.15.3 Chuck Atkins (1): CrayPrgEnv: Change default linking mode based on PE version M Furkan USLU (1): ccmake: handle cache entries with empty STRINGS property Marvin Schmidt (1): libarchive: We now require at least version 3.3.3 Robert Maynard (1): FindMPI: Restore MPI__COMPILE_FLAGS and MPI__COMPILE_OPTIONS Sebastian Holtermann (3): Ninja: Add support for ADDITIONAL_CLEAN_FILES in custom targets Tests: Extend MakeClean test to test various target types Autogen: Fix AUTOUIC segfault, when file includes colliding ui_*.h file --- 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.2-34-g26a0e20
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 26a0e200e5f4abe8268235c9fdb23a2612a1b3b1 (commit) from 7a8bd12926c32f709cc162ba931484c1b5820363 (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: 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
[Cmake-commits] CMake branch, master, updated. v3.15.2-982-gee15bc7
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 ee15bc7d7e7707fd8d7db92645c2c56a5df0f681 (commit) via 26a0e200e5f4abe8268235c9fdb23a2612a1b3b1 (commit) from aef152b91d9f56af87ca2b9618f07228e5f3c463 (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=ee15bc7d7e7707fd8d7db92645c2c56a5df0f681 commit ee15bc7d7e7707fd8d7db92645c2c56a5df0f681 Merge: aef152b 26a0e20 Author: Brad King AuthorDate: Wed Sep 4 10:36:51 2019 -0400 Commit: Brad King CommitDate: Wed Sep 4 10:36:51 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, master, updated. v3.15.2-980-gaef152b
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 aef152b91d9f56af87ca2b9618f07228e5f3c463 (commit) via 790db8d477cfaf10b227d6d7a7ca2c0d7d8aaf62 (commit) via 7a8bd12926c32f709cc162ba931484c1b5820363 (commit) via 907d3ed824d8b82525c687747662b358accded9c (commit) via 2d357b7a682070fc98f520212d82efa821fc821c (commit) from 09032f09f8d2b4f7af658060ef434083f9d6a0d4 (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=aef152b91d9f56af87ca2b9618f07228e5f3c463 commit aef152b91d9f56af87ca2b9618f07228e5f3c463 Merge: 790db8d 7a8bd12 Author: Brad King AuthorDate: Wed Sep 4 09:43:43 2019 -0400 Commit: Brad King CommitDate: Wed Sep 4 09:43:43 2019 -0400 Merge branch 'release-3.15' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=790db8d477cfaf10b227d6d7a7ca2c0d7d8aaf62 commit 790db8d477cfaf10b227d6d7a7ca2c0d7d8aaf62 Merge: 09032f0 907d3ed Author: Brad King AuthorDate: Wed Sep 4 13:43:07 2019 + Commit: Kitware Robot CommitDate: Wed Sep 4 09:43:18 2019 -0400 Merge topic 'FindBoost-1.71' 907d3ed824 FindBoost: Tolerate future Boost INTERFACE libraries 2d357b7a68 FindBoost: Clarify role of legacy variables in warning message Acked-by: Kitware Robot Merge-request: !3780 --- Summary of changes: Modules/FindBoost.cmake | 24 +++- 1 file changed, 15 insertions(+), 9 deletions(-) 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.2-33-g7a8bd12
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 7a8bd12926c32f709cc162ba931484c1b5820363 (commit) via 907d3ed824d8b82525c687747662b358accded9c (commit) via 2d357b7a682070fc98f520212d82efa821fc821c (commit) from 3b8fa496e7a9482cb4592e9f36b54f5b1bc3cdea (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/FindBoost.cmake | 24 +++- 1 file changed, 15 insertions(+), 9 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.2-975-g09032f0
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 09032f09f8d2b4f7af658060ef434083f9d6a0d4 (commit)
via 7b50b05aa9f162388fc9f57899baffdafad7d4af (commit)
via 62e5f722899cfa7c51791be7697c9030aee3a19b (commit)
via 383bf3b5e7609621719a8923b65d003087789e98 (commit)
from efbd50383386c00cde63a7b67672b8487b00980f (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=09032f09f8d2b4f7af658060ef434083f9d6a0d4
commit 09032f09f8d2b4f7af658060ef434083f9d6a0d4
Merge: 7b50b05 383bf3b
Author: Brad King
AuthorDate: Wed Sep 4 12:53:49 2019 +
Commit: Kitware Robot
CommitDate: Wed Sep 4 08:53:59 2019 -0400
Merge topic 'pch-fix-vs-test'
383bf3b5e7 Precompile Headers: Fix Visual Studio 10 unit test
Acked-by: Kitware Robot
Merge-request: !3770
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b50b05aa9f162388fc9f57899baffdafad7d4af
commit 7b50b05aa9f162388fc9f57899baffdafad7d4af
Merge: efbd503 62e5f72
Author: Brad King
AuthorDate: Wed Sep 4 12:52:32 2019 +
Commit: Kitware Robot
CommitDate: Wed Sep 4 08:52:45 2019 -0400
Merge topic 'tidy-use-using'
62e5f72289 clang-tidy: Replace typedef with using
Acked-by: Kitware Robot
Merge-request: !3731
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=62e5f722899cfa7c51791be7697c9030aee3a19b
commit 62e5f722899cfa7c51791be7697c9030aee3a19b
Author: Regina Pfeifer
AuthorDate: Fri Aug 23 23:25:56 2019 +0200
Commit: Brad King
CommitDate: Tue Sep 3 13:21:26 2019 -0400
clang-tidy: Replace typedef with using
diff --git a/Source/CPack/cmCPackFreeBSDGenerator.cxx
b/Source/CPack/cmCPackFreeBSDGenerator.cxx
index a35977c..bbba8a1 100644
--- a/Source/CPack/cmCPackFreeBSDGenerator.cxx
+++ b/Source/CPack/cmCPackFreeBSDGenerator.cxx
@@ -131,7 +131,7 @@ public:
class ManifestKeyListValue : public ManifestKey
{
public:
- typedef std::vector VList;
+ using VList = std::vector;
VList value;
ManifestKeyListValue(const std::string& k)
diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx
index 69dac88..b4b320d 100644
--- a/Source/CPack/cpack.cxx
+++ b/Source/CPack/cpack.cxx
@@ -157,7 +157,7 @@ int main(int argc, char const* const* argv)
cmsys::CommandLineArguments arg;
arg.Initialize(argc, argv);
- typedef cmsys::CommandLineArguments argT;
+ using argT = cmsys::CommandLineArguments;
// Help arguments
arg.AddArgument("--help", argT::NO_ARGUMENT, , "CPack help");
arg.AddArgument("--help-full", argT::SPACE_ARGUMENT, ,
diff --git a/Source/CTest/cmCTestBZR.cxx b/Source/CTest/cmCTestBZR.cxx
index b957856..52dc0ac 100644
--- a/Source/CTest/cmCTestBZR.cxx
+++ b/Source/CTest/cmCTestBZR.cxx
@@ -200,8 +200,8 @@ public:
private:
cmCTestBZR* BZR;
- typedef cmCTestBZR::Revision Revision;
- typedef cmCTestBZR::Change Change;
+ using Revision = cmCTestBZR::Revision;
+ using Change = cmCTestBZR::Change;
Revision Rev;
std::vector Changes;
Change CurChange;
diff --git a/Source/CTest/cmCTestCVS.cxx b/Source/CTest/cmCTestCVS.cxx
index 560c169..b9b90c8 100644
--- a/Source/CTest/cmCTestCVS.cxx
+++ b/Source/CTest/cmCTestCVS.cxx
@@ -105,7 +105,7 @@ bool cmCTestCVS::UpdateImpl()
class cmCTestCVS::LogParser : public cmCTestVC::LineParser
{
public:
- typedef cmCTestCVS::Revision Revision;
+ using Revision = cmCTestCVS::Revision;
LogParser(cmCTestCVS* cvs, const char* prefix, std::vector& revs)
: CVS(cvs)
, Revisions(revs)
diff --git a/Source/CTest/cmCTestGIT.cxx b/Source/CTest/cmCTestGIT.cxx
index f7319ef..3ae464d 100644
--- a/Source/CTest/cmCTestGIT.cxx
+++ b/Source/CTest/cmCTestGIT.cxx
@@ -333,7 +333,7 @@ public:
this->SetLog(>Log, prefix);
}
- typedef cmCTestGIT::Change Change;
+ using Change = cmCTestGIT::Change;
std::vector Changes;
protected:
@@ -456,7 +456,7 @@ public:
}
private:
- typedef cmCTestGIT::Revision Revision;
+ using Revision = cmCTestGIT::Revision;
enum SectionType
{
SectionHeader,
diff --git a/Source/CTest/cmCTestHG.cxx b/Source/CTest/cmCTestHG.cxx
index ba2252a..297077e 100644
--- a/Source/CTest/cmCTestHG.cxx
+++ b/Source/CTest/cmCTestHG.cxx
@@ -174,8 +174,8 @@ public:
private:
cmCTestHG* HG;
- typedef cmCTestHG::Revision Revision;
- typedef cmCTestHG::Change Change;
+ using Revision = cmCTestHG::Revision;
+ using Change = cmCTestHG::Change;
Revision Rev;
std::vector Changes;
Change CurChange;
diff --git a/Source/CTest/cmCTestP4.cxx b/Source/CTest/cmCTestP4.cxx
index 64354e8..9bca7cb 100644
--- a/Source/CTest/cmCTestP4.cxx
+++ b/Source/CTest/cmCTestP4.cxx
[Cmake-commits] CMake branch, master, updated. v3.15.2-971-gefbd503
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 efbd50383386c00cde63a7b67672b8487b00980f (commit)
via fb9da8e6f421263e8904e8d12586bf7b068ed3b4 (commit)
from 2b478a921aedd55c2596bc0cb083ffea7244bb0e (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=efbd50383386c00cde63a7b67672b8487b00980f
commit efbd50383386c00cde63a7b67672b8487b00980f
Merge: 2b478a9 fb9da8e
Author: Brad King
AuthorDate: Wed Sep 4 12:49:44 2019 +
Commit: Kitware Robot
CommitDate: Wed Sep 4 08:50:19 2019 -0400
Merge topic 'fortran-INCLUDE-defines'
fb9da8e6f4 Ninja: Pass preprocessor definitions when compiling with Intel
Fortran
Acked-by: Kitware Robot
Merge-request: !3764
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fb9da8e6f421263e8904e8d12586bf7b068ed3b4
commit fb9da8e6f421263e8904e8d12586bf7b068ed3b4
Author: Brad King
AuthorDate: Fri Aug 30 15:30:51 2019 -0400
Commit: Brad King
CommitDate: Tue Sep 3 14:20:26 2019 -0400
Ninja: Pass preprocessor definitions when compiling with Intel Fortran
The Intel Fortran compiler supports an extension that allows conditional
compilation based on preprocessor definitions specified on the command
line even when not preprocessing.
Fixes: #19664
diff --git a/Modules/Compiler/Intel-Fortran.cmake
b/Modules/Compiler/Intel-Fortran.cmake
index 5275ddf..156b533 100644
--- a/Modules/Compiler/Intel-Fortran.cmake
+++ b/Modules/Compiler/Intel-Fortran.cmake
@@ -8,6 +8,8 @@ set(CMAKE_Fortran_MODDIR_FLAG "-module ")
set(CMAKE_Fortran_FORMAT_FIXED_FLAG "-fixed")
set(CMAKE_Fortran_FORMAT_FREE_FLAG "-free")
+set(CMAKE_Fortran_COMPILE_WITH_DEFINES 1)
+
set(CMAKE_Fortran_CREATE_PREPROCESSED_SOURCE "
-E > ")
set(CMAKE_Fortran_CREATE_ASSEMBLY_SOURCE "
-S -o ")
diff --git a/Source/cmNinjaTargetGenerator.cxx
b/Source/cmNinjaTargetGenerator.cxx
index 29e8b74..90b59e7 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -108,6 +108,13 @@ bool cmNinjaTargetGenerator::UsePreprocessedSource(
return lang == "Fortran";
}
+bool cmNinjaTargetGenerator::CompilePreprocessedSourceWithDefines(
+ std::string const& lang) const
+{
+ return this->Makefile->IsOn(
+cmStrCat("CMAKE_", lang, "_COMPILE_WITH_DEFINES"));
+}
+
std::string cmNinjaTargetGenerator::LanguageDyndepRule(
const std::string& lang) const
{
@@ -458,12 +465,14 @@ void cmNinjaTargetGenerator::WriteCompileRule(const
std::string& lang)
vars.ObjectDir = "$OBJECT_DIR";
vars.ObjectFileDir = "$OBJECT_FILE_DIR";
+ cmMakefile* mf = this->GetMakefile();
+
// For some cases we do an explicit preprocessor invocation.
bool const explicitPP = this->NeedExplicitPreprocessing(lang);
+ bool const compilePPWithDefines = this->UsePreprocessedSource(lang) &&
+this->CompilePreprocessedSourceWithDefines(lang);
bool const needDyndep = this->NeedDyndep(lang);
- cmMakefile* mf = this->GetMakefile();
-
std::string flags = "$FLAGS";
std::string responseFlag;
@@ -517,9 +526,14 @@ void cmNinjaTargetGenerator::WriteCompileRule(const
std::string& lang)
// Preprocessing and compilation use the same flags.
std::string ppFlags = flags;
-// Move preprocessor definitions to the preprocessor rule.
-ppVars.Defines = vars.Defines;
-vars.Defines = "";
+if (!compilePPWithDefines) {
+ // Move preprocessor definitions to the preprocessor rule.
+ ppVars.Defines = vars.Defines;
+ vars.Defines = "";
+} else {
+ // Copy preprocessor definitions to the preprocessor rule.
+ ppVars.Defines = vars.Defines;
+}
// Copy include directories to the preprocessor rule. The Fortran
// compilation rule still needs them for the INCLUDE directive.
@@ -1011,6 +1025,8 @@ void cmNinjaTargetGenerator::WriteObjectBuildStatement(
ppBuild.RspFile = ppFileName + ".rsp";
bool const compilePP = this->UsePreprocessedSource(language);
+bool const compilePPWithDefines =
+ compilePP && this->CompilePreprocessedSourceWithDefines(language);
if (compilePP) {
// Move compilation dependencies to the preprocessing build statement.
std::swap(ppBuild.ExplicitDeps, objBuild.ExplicitDeps);
@@ -1039,7 +1055,7 @@ void cmNinjaTargetGenerator::WriteObjectBuildStatement(
this->LocalGenerator->AppendFlags(vars["FLAGS"], postFlag);
}
-if (compilePP) {
+if (compilePP && !compilePPWithDefines) {
// Move preprocessor definitions to the preprocessor build statement.
std::swap(ppBuild.Variables["DEFINES"],
[Cmake-commits] CMake branch, master, updated. v3.15.2-969-g2b478a9
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 2b478a921aedd55c2596bc0cb083ffea7244bb0e (commit) via b96155f228a6f5fd1af263a927d35e3683a58766 (commit) from 787765d4025cd1caa842d9bcfcf6cd71222b9d44 (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=2b478a921aedd55c2596bc0cb083ffea7244bb0e commit 2b478a921aedd55c2596bc0cb083ffea7244bb0e Merge: 787765d b96155f Author: Brad King AuthorDate: Wed Sep 4 12:34:53 2019 + Commit: Kitware Robot CommitDate: Wed Sep 4 08:35:11 2019 -0400 Merge topic 'fix-copy-directory-docs' b96155f228 Help: Fix copy_directory description Acked-by: Kitware Robot Merge-request: !3769 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b96155f228a6f5fd1af263a927d35e3683a58766 commit b96155f228a6f5fd1af263a927d35e3683a58766 Author: Leonid Pospelov AuthorDate: Mon Sep 2 15:21:16 2019 +0300 Commit: Leonid Pospelov CommitDate: Mon Sep 2 15:21:16 2019 +0300 Help: Fix copy_directory description diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst index 26ef904..0645e41 100644 --- a/Help/manual/cmake.1.rst +++ b/Help/manual/cmake.1.rst @@ -462,7 +462,7 @@ Available commands are: but the files or directories it point to. ``copy_directory ... `` - Copy directories to directory. + Copy content of ``...`` directories to directory. If directory does not exist it will be created. ``copy_directory`` does follow symlinks. --- Summary of changes: Help/manual/cmake.1.rst | 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
Re: [CMake] external project CONFIGURE_COMMAND adds quotation to arguments
Brilliant!
your suggestion has worked!
Thank you so much
Edo
On Wed, Sep 4, 2019 at 11:23 AM Eric Doenges wrote:
> On 04.09.2019 11:55, Edoardo Pasca wrote:
>
> Dear all,
>
> I'm using ExternalProjectAdd to build an external package.
>
> On the CONFIGURE_COMMAND I have to pass some variables to the configure
> script in this form:
>
> configure CPPFLAGS="-I/dir/include -L/dir/lib"
>
> To do this I use
>
> CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env ${CMAKE_BINARY_DIR}/configure
> CPPFLAGS="-I/dir/include -L/dir/lib"
>
> However, when cmake issues that command (you can see that with make
> VERBOSE=1) it wraps the CPPFLAGS parameters with quotation marks (as below)
> and the configure script fails
>
> configure "CPPFLAGS=\"-I/dir/include -L/dir/lib\""
>
> Below you can find a minimal CMakeLists.txt to test this.
>
> I'd appreciate any help on how I'd remove those quotation marks.
>
> Thanks
>
> Edo
>
>
> What I do is let CMake handle this itself by defining a (list) variable
> for the configure command:
>
> set(cmd "${CMAKE_BINARY_DIR}/configure")
> list(APPEND cmd "CPPFLAGS=-I/dir/include -L/dir/lib")
> ExternalProject_Add(...
> CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env ${cmd}
> ...)
>
> Since cmd is a list, CMake knows that the -L/dir/lib belongs to the
> CPPFLAGS=-I/dir/include part, and puts double quotes around the entire
> thing, e.g. the actual command line will look something like this:
>
> /configure "CPPFLAG=-Idir/include -L/dir/lib"
> This works with GNU autoconf. I've found that in general, dealing with
> quoting in ExternalProject_Add is a gigantic pain, so if the method above
> is not sufficient, I use configure_file or file(WRITE) to generate a shell
> script (Linux) or batch file (Windows) with the correct parameters and call
> that instead.
>
> With kind regards,
> Eric Dönges
>
> *Dr. Eric Dönges *
> Senior Software Engineer
>
> MVTec Software GmbH | Arnulfstr. 205 | 80634 Munich | Germany
> doen...@mvtec.com | Tel: +49 89 457 695-0 | www.mvtec.com
>
> Sign up for our MVTec Newsletter!
>
> Geschäftsführer: Dr. Wolfgang Eckstein, Dr. Olaf Munkelt
> Amtsgericht München HRB 114695
>
>
> [image: MVTec Software GmbH Logo]
> --
>
> 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
>
--
Edo
I know you think you understand what you thought I said, but I'm not sure
you realize that what you heard is not what I meant (prob. Alan Greenspan)
:wq
--
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] Finding custom qmake path
I might be wrong, but I think you can simply use target names, like `add_custom_command(COMMAND Qt5::qmake --arg file1 file2)`. On 03.09.2019 16:36, Stéphane Ancelot wrote: I solved it using |get_target_property (QT_QMAKE_EXECUTABLE Qt5::qmake IMPORTED_LOCATION)| Le 03/09/2019 à 15:05, Stéphane Ancelot a écrit : Hi, Is there a way to find qmake path of a custom setup in order using it an add_custom_command my QT5 path is available in CMAKE_PREFIX_PATH. Regards,, S.Ancelot -- 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] external project CONFIGURE_COMMAND adds quotation to arguments
On 04.09.2019 11:55, Edoardo Pasca wrote:
Dear all,
I'm using ExternalProjectAdd to build an
external package.
On the CONFIGURE_COMMAND I have to pass
some variables to the configure script in this form:
configure CPPFLAGS="-I/dir/include
-L/dir/lib"
To do this I use
CONFIGURE_COMMAND ${CMAKE_COMMAND} -E
env ${CMAKE_BINARY_DIR}/configure CPPFLAGS="-I/dir/include
-L/dir/lib"
However, when cmake issues that command
(you can see that with make VERBOSE=1) it wraps the CPPFLAGS
parameters with quotation marks (as below) and the configure
script fails
configure
"CPPFLAGS=\"-I/dir/include -L/dir/lib\""
Below you can find
a minimal CMakeLists.txt to test this.
I'd appreciate any
help on how I'd remove those quotation marks.
Thanks
Edo
What I do is let CMake handle this
itself by defining a (list) variable for the configure command:
set(cmd
"${CMAKE_BINARY_DIR}/configure")
list(APPEND cmd
"CPPFLAGS=-I/dir/include -L/dir/lib")
ExternalProject_Add(...
CONFIGURE_COMMAND ${CMAKE_COMMAND} -E
env ${cmd}
...)
Since cmd is a list, CMake knows that
the -L/dir/lib belongs to the CPPFLAGS=-I/dir/include part, and
puts double quotes around the entire thing, e.g. the actual
command line will look something like this:
/configure "CPPFLAG=-Idir/include -L/dir/lib"
This works with GNU autoconf. I've
found that in general, dealing with quoting in ExternalProject_Add
is a gigantic pain, so if the method above is not sufficient, I
use configure_file or file(WRITE) to generate a shell script
(Linux) or batch file (Windows) with the correct parameters and
call that instead.
With kind regards,
Eric Dönges
Dr. Eric Dönges
Senior Software Engineer
MVTec Software
GmbH | Arnulfstr. 205 | 80634 Munich | Germany
doen...@mvtec.com
| Tel: +49 89 457 695-0 | www.mvtec.com
Sign up for our
MVTec Newsletter!
Geschäftsführer:
Dr. Wolfgang Eckstein, Dr. Olaf Munkelt
Amtsgericht München HRB 114695
--
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] external project CONFIGURE_COMMAND adds quotation to arguments
Dear all,
I'm using ExternalProjectAdd to build an external package.
On the CONFIGURE_COMMAND I have to pass some variables to the configure
script in this form:
configure CPPFLAGS="-I/dir/include -L/dir/lib"
To do this I use
CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env ${CMAKE_BINARY_DIR}/configure
CPPFLAGS="-I/dir/include -L/dir/lib"
However, when cmake issues that command (you can see that with make
VERBOSE=1) it wraps the CPPFLAGS parameters with quotation marks (as below)
and the configure script fails
configure "CPPFLAGS=\"-I/dir/include -L/dir/lib\""
Below you can find a minimal CMakeLists.txt to test this.
I'd appreciate any help on how I'd remove those quotation marks.
Thanks
Edo
cmake_minimum_required(VERSION 3.9.0)
project(libACE)
include(ExternalProject)
#create a configure script
file(WRITE ${CMAKE_SOURCE_DIR}/configure
"
#! /bin/bash
echo $0 received $# parameters
for arg
do echo $arg
done
")
file(COPY ${CMAKE_SOURCE_DIR}/configure
DESTINATION ${CMAKE_BINARY_DIR}
FILE_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ)
ExternalProject_Add(
external_test
GIT_REPOSITORY https://github.com/paskino/libace-conda
GIT_TAG origin/master
CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env ${CMAKE_BINARY_DIR}/configure
NVCCFLAGS="-Idir -Ldir" CPPFLAGS="-Idirc -Ldirl"
BUILD_COMMAND ""
INSTALL_COMMAND ""
LOG_INSTALL 1
BINARY_DIR ${CMAKE_BINARY_DIR}/build/
INSTALL_DIR ${CMAKE_BINARY_DIR}/install
STAMP_DIR ${CMAKE_BINARY_DIR}/stamp
TMP_DIR ${CMAKE_BINARY_DIR}/tmp
DOWNLOAD_DIR ${CMAKE_BINARY_DIR}/download
SOURCE_DIR ${CMAKE_BINARY_DIR}/source
)
--
Edo
I know you think you understand what you thought I said, but I'm not sure
you realize that what you heard is not what I meant (prob. Alan Greenspan)
:wq
--
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
