Re: [CMake] Syntax to document cmake files, functions and macros

2019-01-31 Thread Torsten Robitzki 


> Am 31.01.2019 um 19:55 schrieb Marc Herbert :
> 
> So is there a relatively simple way to run the same tooling on any regular, 
> non-module .cmake files
> too and produce project-specific documentation?

We are working on a larger CMake project and we use Sphinx. We use 
sphinxcontrib.moderncmakedomain as extension, which adds CMake syntax 
highlighting and sphinx.ext.intersphinx to allow us, to refer to the original 
CMake documentation.

regards,

Torsten


signature.asc
Description: Message signed with OpenPGP
-- 

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] Checking Variables in a tool-chain file

2019-01-31 Thread Torsten 

> Am 31.01.2019 um 21:10 schrieb Craig Scott :
> 
> This is precisely the scenario that the CMAKE_TRY_COMPILE_PLATFORM_VARIABLES 
> variable is meant for. It allows a toolchain file to specify additional 
> variables that should be passed along to try_compile().

Works like a charm. Thanks a lot!

Torsten



signature.asc
Description: Message signed with OpenPGP
-- 

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.13.3-1265-g9512a58

2019-01-31 Thread Kitware Robot via Cmake-commits 
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  9512a582389df6f588781eed41cf826a7bacabe0 (commit)
  from  d526327079e23748dd2a87acd4d9b4b1174725bf (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=9512a582389df6f588781eed41cf826a7bacabe0
commit 9512a582389df6f588781eed41cf826a7bacabe0
Author: Kitware Robot 
AuthorDate: Fri Feb 1 00:01:07 2019 -0500
Commit: Kitware Robot 
CommitDate: Fri Feb 1 00:01:07 2019 -0500

CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 3f37c95..0a65114 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 13)
-set(CMake_VERSION_PATCH 20190131)
+set(CMake_VERSION_PATCH 20190201)
 #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

Re: [CMake] Checking Variables in a tool-chain file

2019-01-31 Thread Shoaib Meenai 
That’s perfect! It looks like it was introduced in CMake 3.6, whereas LLVM 
targets a minimum of 3.4.3 right now, but I’ll make a note of it for the next 
CMake upgrade. Thanks!

From: CMake  on behalf of Craig Scott 

Date: Thursday, January 31, 2019 at 12:10 PM
To: "tors...@robitzki.de" 
Cc: CMake MailingList 
Subject: Re: [CMake] Checking Variables in a tool-chain file

This is precisely the scenario that the 
CMAKE_TRY_COMPILE_PLATFORM_VARIABLES
 variable is meant for. It allows a toolchain file to specify additional 
variables that should be passed along to try_compile().


On Fri, Feb 1, 2019 at 6:36 AM Shoaib Meenai 
mailto:smee...@fb.com>> wrote:
We have a somewhat similar problem with LLVM's toolchain file for 
cross-compiling to Windows, and we solve it there by saving and restoring cache 
variables from the environment inside the toolchain file itself. See 
https://reviews.llvm.org/diffusion/L/browse/llvm/trunk/cmake/platforms/WinMsvc.cmake;352783$88-102?as=source=off
 and the subsequent calls to init_user_prop.

On 1/31/19, 12:19 AM, "CMake on behalf of tors...@robitzki.de" 
mailto:cmake-boun...@cmake.org> on behalf of 
tors...@robitzki.de> wrote:

Hi Sergei,

> Am 31.01.2019 um 08:42 schrieb Sergei Nikulov 
mailto:sergey.niku...@gmail.com>>:
>
> Just guessing maybe better use $ENV{ARM_GCC_TOOL_PATH} ?
> 
https://cmake.org/cmake/help/latest/variable/ENV.html?highlight=env

Well, but this would mean, I had to configure CMake not only with Cache 
variables:

cmake -DARM_GCC_TOOL_PATH=/usr/local/gcc-arm-none-eabi-7-2018-q2-update 
-DBINDING=nrf52 -DCMAKE_TOOLCHAIN_FILE=../cmake/gcc-arm-none-eabi.cmake 
-DNRF5_SDK_ROOT=~/CMSIS/nRF5_SDK_14-2/ ..

But also with environment variables:
ARM_GCC_TOOL_PATH=/usr/local/gcc-arm-none-eabi-7-2018-q2-update cmake 
-DBINDING=nrf52 -DCMAKE_TOOLCHAIN_FILE=../cmake/gcc-arm-none-eabi.cmake 
-DNRF5_SDK_ROOT=~/CMSIS/nRF5_SDK_14-2/ ..

Thanks for the pointer, I will think about it.

kind regards,
Torsten

--
Craig Scott
Melbourne, Australia
https://crascit.com

Get the hand-book for every CMake user: Professional CMake: A Practical 
Guide
-- 

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] Checking Variables in a tool-chain file

2019-01-31 Thread Craig Scott 
This is precisely the scenario that the CMAKE_TRY_COMPILE_PLATFORM_VARIABLES

variable
is meant for. It allows a toolchain file to specify additional variables
that should be passed along to try_compile().


On Fri, Feb 1, 2019 at 6:36 AM Shoaib Meenai  wrote:

> We have a somewhat similar problem with LLVM's toolchain file for
> cross-compiling to Windows, and we solve it there by saving and restoring
> cache variables from the environment inside the toolchain file itself. See
> https://reviews.llvm.org/diffusion/L/browse/llvm/trunk/cmake/platforms/WinMsvc.cmake;352783$88-102?as=source=off
> and the subsequent calls to init_user_prop.
>
> On 1/31/19, 12:19 AM, "CMake on behalf of tors...@robitzki.de" <
> cmake-boun...@cmake.org on behalf of tors...@robitzki.de> wrote:
>
> Hi Sergei,
>
> > Am 31.01.2019 um 08:42 schrieb Sergei Nikulov <
> sergey.niku...@gmail.com>:
> >
> > Just guessing maybe better use $ENV{ARM_GCC_TOOL_PATH} ?
> > https://cmake.org/cmake/help/latest/variable/ENV.html?highlight=env
>
> Well, but this would mean, I had to configure CMake not only with
> Cache variables:
>
> cmake
> -DARM_GCC_TOOL_PATH=/usr/local/gcc-arm-none-eabi-7-2018-q2-update
> -DBINDING=nrf52 -DCMAKE_TOOLCHAIN_FILE=../cmake/gcc-arm-none-eabi.cmake
> -DNRF5_SDK_ROOT=~/CMSIS/nRF5_SDK_14-2/ ..
>
> But also with environment variables:
> ARM_GCC_TOOL_PATH=/usr/local/gcc-arm-none-eabi-7-2018-q2-update cmake
> -DBINDING=nrf52 -DCMAKE_TOOLCHAIN_FILE=../cmake/gcc-arm-none-eabi.cmake
> -DNRF5_SDK_ROOT=~/CMSIS/nRF5_SDK_14-2/ ..
>
> Thanks for the pointer, I will think about it.
>
> kind regards,
> Torsten
>

-- 
Craig Scott
Melbourne, Australia
https://crascit.com

Get the hand-book for every CMake user: Professional CMake: A Practical
Guide 
-- 

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] Checking Variables in a tool-chain file

2019-01-31 Thread Shoaib Meenai 
We have a somewhat similar problem with LLVM's toolchain file for 
cross-compiling to Windows, and we solve it there by saving and restoring cache 
variables from the environment inside the toolchain file itself. See 
https://reviews.llvm.org/diffusion/L/browse/llvm/trunk/cmake/platforms/WinMsvc.cmake;352783$88-102?as=source=off
 and the subsequent calls to init_user_prop.

On 1/31/19, 12:19 AM, "CMake on behalf of tors...@robitzki.de" 
 wrote:

Hi Sergei,

> Am 31.01.2019 um 08:42 schrieb Sergei Nikulov :
> 
> Just guessing maybe better use $ENV{ARM_GCC_TOOL_PATH} ?
> https://cmake.org/cmake/help/latest/variable/ENV.html?highlight=env

Well, but this would mean, I had to configure CMake not only with Cache 
variables:

cmake -DARM_GCC_TOOL_PATH=/usr/local/gcc-arm-none-eabi-7-2018-q2-update 
-DBINDING=nrf52 -DCMAKE_TOOLCHAIN_FILE=../cmake/gcc-arm-none-eabi.cmake 
-DNRF5_SDK_ROOT=~/CMSIS/nRF5_SDK_14-2/ ..

But also with environment variables:
ARM_GCC_TOOL_PATH=/usr/local/gcc-arm-none-eabi-7-2018-q2-update cmake 
-DBINDING=nrf52 -DCMAKE_TOOLCHAIN_FILE=../cmake/gcc-arm-none-eabi.cmake 
-DNRF5_SDK_ROOT=~/CMSIS/nRF5_SDK_14-2/ ..

Thanks for the pointer, I will think about it.

kind regards,
Torsten


-- 

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] Syntax to document cmake files, functions and macros

2019-01-31 Thread Marc Herbert 
> 
> On 24 Dec 2018, at 03:32, Oleksii Vilchanskyi  gmail.com> wrote:
> 
> On 12/24/18 12:01 PM, Olivier Croquette wrote:
>> I have quite a few .cmake files that I want to document. They define
>> functions, macros, and variables, and I was wondering if there is any
>> standard or tooling to help.
> 
> Yes, see [1]. You can find concrete examples at [2].
> 
> [1]:
> 
> [2]: 

This is very promising, however:

https://cmake.org/cmake/help/latest/manual/cmake-developer.7.html#module-documentation

“ This manual is intended for reference by developers modifying the CMake 
source tree itself,
and by those authoring externally-maintained modules.
...
To document CMake module Modules/.cmake,
modify Help/manual/cmake-modules.7.rst to reference the module in the toctree 
directive
...
Test the documentation formatting by running cmake --help-module ,
and also by enabling the SPHINX_HTML and SPHINX_MAN options to build the 
documentation."


So is there a relatively simple way to run the same tooling on any regular, 
non-module .cmake files
too and produce project-specific documentation?


-- 

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-developers] CDash frontend refresh

2019-01-31 Thread Zack Galbreath via cmake-developers 
We've been working on a refresh of CDash's look and feel. Before rolling
this out, we wanted to give you all a sneak peek so that you could let us
know what you think.

Our proposed changes are now live on http://testing.cdash.org, which shares
a backend database with https://open.cdash.org.

For example,
old:   https://open.cdash.org/index.php?project=VTK
new: http://testing.cdash.org/index.php?project=VTK

This is inevitably a work in progress so future tweaks should be expected.
That being said, please let us know if you see anything that seems like an
obvious defect to you.
-- 

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

Re: [cmake-developers] CMake 3.13 - Generated moc files not added to VStudio solution

2019-01-31 Thread Venedict Tchistopolskii 
Thanks! Worked, glad to have a smaller fix.

VT

On Thu, Jan 31, 2019 at 9:10 AM Sebastian Holtermann 
wrote:

> > Any luck? I can try helping ya trace it if you need it.
> >
>
> I traced this down to some degree.
> The problem arises from the handling of file path for GENERATED vs non
> GENERATED files.
> When the full path for a file is computed in cmSourceFile and the file
> doesn't
> exist (mocs_compilation.cpp doesn't, yet), a path error flag is set.
> The flag won't be raised when the file has the property GENERATED set,
> which
> mocs_compilation.cpp hasn't at that point.
>
> A quick solution in your CMakeLists.txt is to mark mocs_compilation.cpp
> GENERATED first like this
>
> ```
> set_property(SOURCE "${MOC_COMPILATION}" APPEND_STRING PROPERTY GENERATED
> "1")
> set_property(SOURCE "${MOC_COMPILATION}" APPEND_STRING PROPERTY
> COMPILE_FLAGS
> " /FI\"${PrecompiledHeader}\"")
> ```
>
> This works here for a small example project.
>
> I'm too busy right now to address this in the CMake sources but I'll try
> to
> look at it next week.
>
> -Sebastian
>
>
>
>
>
-- 

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

Re: [cmake-developers] CMake 3.13 - Generated moc files not added to VStudio solution

2019-01-31 Thread Sebastian Holtermann 
> Any luck? I can try helping ya trace it if you need it.
> 

I traced this down to some degree.
The problem arises from the handling of file path for GENERATED vs non 
GENERATED files.
When the full path for a file is computed in cmSourceFile and the file doesn't
exist (mocs_compilation.cpp doesn't, yet), a path error flag is set.
The flag won't be raised when the file has the property GENERATED set, which
mocs_compilation.cpp hasn't at that point.

A quick solution in your CMakeLists.txt is to mark mocs_compilation.cpp
GENERATED first like this

```
set_property(SOURCE "${MOC_COMPILATION}" APPEND_STRING PROPERTY GENERATED "1")
set_property(SOURCE "${MOC_COMPILATION}" APPEND_STRING PROPERTY COMPILE_FLAGS 
" /FI\"${PrecompiledHeader}\"")
```

This works here for a small example project.

I'm too busy right now to address this in the CMake sources but I'll try to 
look at it next week.

-Sebastian




-- 

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

Re: [cmake-developers] CMake 3.13 - Generated moc files not added to VStudio solution

2019-01-31 Thread Venedict Tchistopolskii 
Any luck? I can try helping ya trace it if you need it.

Hoping to get this solved before the weekend xd

On Wed, Jan 30, 2019 at 7:32 AM Venedict Tchistopolskii 
wrote:

> Gotcha, my project builds atm and it's fairly large, didn't know that it
> broke anything else.
>
> Please let me know when someone fixes it :)
>
> VT
>
> On Wed, Jan 30, 2019 at 6:31 AM Sebastian Holtermann 
> wrote:
>
>> Hello Venedict,
>>
>> I took a look at this again, thanks for the additional information.
>> In fact this isn't VS specific. I was able to reproduce the issue using
>> Linux/Makefiles.
>>
>> > Got the fix, hopefully it can be merged in :)
>> >
>> https://github.com/Personwithhat/custom_cmake/commit/d7930c36c6aa7956a806a28
>> > 4aa7e1e430ef6c174
>>
>> This change is too intrusive and breaks a lot of other things.
>>
>> > >>> set (MOC_COMPILATION
>> > >>>
>> "${CMAKE_CURRENT_BINARY_DIR}/${TargetProject}_autogen/mocs_compilation.c
>> > >>> pp") # stdafx.h needs to be included to ensure platform definitions
>> are
>> > >>> visible
>> > >>> set_property(SOURCE "${MOC_COMPILATION}" APPEND_STRING PROPERTY
>> > >>> COMPILE_FLAGS " /FI\"${PrecompiledHeader}\"")
>>
>> Setting compiler flags on the mocs_compilation.cpp file is the root cause.
>> I'll investigate this deeper.
>>
>> -Sebastian
>>
>>
>>
>>
-- 

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-commits] CMake branch, master, updated. v3.13.3-1264-gd526327

2019-01-31 Thread Kitware Robot via Cmake-commits 
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  d526327079e23748dd2a87acd4d9b4b1174725bf (commit)
   via  29368abde7d5b4d3d6f734aa530e82dd9f4ee739 (commit)
   via  1b46f2f12a368e6e4049b814d0b8499394fa442e (commit)
   via  ca0310b919cb389618d480cbdc0124609051866a (commit)
   via  a2dc420cd4946eb3b17fcdcc6c32dafc7c679ad5 (commit)
   via  0933707d5c8b18401834e0787157e2de68f98e51 (commit)
   via  dc9f4f9eca3ee046bbb2f974ab9ae9af7ffc46cf (commit)
   via  fb823855158855b6c967ef8dc7947762c097f914 (commit)
   via  20291e8e7293fd0ba0f5c66fe57388ee20381ccb (commit)
   via  a624a3e1b3105e94ad30722e3053679a3b7d5b7e (commit)
   via  f4f3b6b9af13366b16ce5a3be7af6c2b68c8be09 (commit)
   via  699cd032128afcda78e12a76b227faa6c1f6a258 (commit)
   via  1180fc87803b39cc03e503e4d08fa7d68656da8a (commit)
   via  3f9822ff6d2e38ef9aedc54d654e3afc635596fd (commit)
   via  198650ae7399cc086c49e58b0a9e03e9efb86235 (commit)
   via  8a7f93d000f1676d6051027b0608ca7658c8f00e (commit)
   via  eff9c69740d5d4a26025a89f517a612e446077c0 (commit)
   via  c68465f7908336a29c48539cb9ac0dcb32310abb (commit)
   via  d6fbd438c4ca89a4e5e7eec612b142f8e86faa17 (commit)
  from  24bee427b5da710c5f9941f5cddb455df1a2ea82 (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=d526327079e23748dd2a87acd4d9b4b1174725bf
commit d526327079e23748dd2a87acd4d9b4b1174725bf
Merge: 29368ab a624a3e
Author: Brad King 
AuthorDate: Thu Jan 31 16:19:33 2019 +
Commit: Kitware Robot 
CommitDate: Thu Jan 31 11:19:38 2019 -0500

Merge topic 'ninja-intel-depfile'

a624a3e1b3 Ninja: Use deps=gcc for Intel Compiler on Windows
f4f3b6b9af Ninja: Detect when ninja is new enough to support a multi-line 
depfile
699cd03212 Ninja: Drop unnecessary deptype customization infrastructure

Acked-by: Kitware Robot 
Merge-request: !2893


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=29368abde7d5b4d3d6f734aa530e82dd9f4ee739
commit 29368abde7d5b4d3d6f734aa530e82dd9f4ee739
Merge: 1b46f2f 20291e8
Author: Brad King 
AuthorDate: Thu Jan 31 16:18:34 2019 +
Commit: Kitware Robot 
CommitDate: Thu Jan 31 11:18:40 2019 -0500

Merge topic 'install-strip-macos'

20291e8e72 install: Fix stripping on macOS

Acked-by: Kitware Robot 
Merge-request: !2892


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1b46f2f12a368e6e4049b814d0b8499394fa442e
commit 1b46f2f12a368e6e4049b814d0b8499394fa442e
Merge: ca0310b 8a7f93d
Author: Brad King 
AuthorDate: Thu Jan 31 16:17:35 2019 +
Commit: Kitware Robot 
CommitDate: Thu Jan 31 11:17:40 2019 -0500

Merge topic 'xcode-object-dir'

8a7f93d000 Xcode: Fix object library builds with sanitizers enabled
eff9c69740 Xcode: Place object library artifacts outside Objects-normal 
directory

Acked-by: Kitware Robot 
Merge-request: !2885


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ca0310b919cb389618d480cbdc0124609051866a
commit ca0310b919cb389618d480cbdc0124609051866a
Merge: a2dc420 198650a
Author: Brad King 
AuthorDate: Thu Jan 31 16:15:34 2019 +
Commit: Kitware Robot 
CommitDate: Thu Jan 31 11:16:53 2019 -0500

Merge topic 'set-validate-cache-type'

198650ae73 set: warn if CACHE type is not recognized

Acked-by: Kitware Robot 
Merge-request: !2874


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a2dc420cd4946eb3b17fcdcc6c32dafc7c679ad5
commit a2dc420cd4946eb3b17fcdcc6c32dafc7c679ad5
Merge: 0933707 c68465f
Author: Brad King 
AuthorDate: Thu Jan 31 16:14:42 2019 +
Commit: Kitware Robot 
CommitDate: Thu Jan 31 11:16:04 2019 -0500

Merge topic 'xerces-xalan-header-checking'

c68465f790 FindXercesC, FindXalanC: Don't examine non-existent version 
headers

Acked-by: Kitware Robot 
Merge-request: !2884


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0933707d5c8b18401834e0787157e2de68f98e51
commit 0933707d5c8b18401834e0787157e2de68f98e51
Merge: dc9f4f9 d6fbd43
Author: Brad King 
AuthorDate: Thu Jan 31 16:14:30 2019 +
Commit: Kitware Robot 
CommitDate: Thu Jan 31 11:15:11 2019 -0500

Merge topic 'autogen-std-bind-to-lambdas'

d6fbd438c4 Autogen: Refactor std::bind calls to lambdas

Acked-by: Kitware Robot 
Merge-request: !2766


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dc9f4f9eca3ee046bbb2f974ab9ae9af7ffc46cf
commit dc9f4f9eca3ee046bbb2f974ab9ae9af7ffc46cf
Merge: fb82385 3f9822f
Author: Brad King 
AuthorDate: Thu Jan 31 16:13:41 2019 +
Commit:

[Cmake-commits] CMake branch, master, updated. v3.13.3-1245-g24bee42

2019-01-31 Thread Kitware Robot via Cmake-commits 
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  24bee427b5da710c5f9941f5cddb455df1a2ea82 (commit)
   via  9aef4a732ba6b0d20c9953d171514fa4c0daaddf (commit)
   via  1b3b0fa43a51aed03f38b98f30d9383bc6d377d6 (commit)
   via  74cba6a3fde29649a924bc54269ed3449743eb5f (commit)
   via  a37614667d2a1d7d3e4db5e1ec8df644bfbe39fa (commit)
   via  e3b26f0004e20c11818e8c6cdd6c778c379d8c67 (commit)
   via  c22e373a3077a90a4f1ed509774412a0ab82d992 (commit)
   via  ec027aa64a8f5ee59d4962673cc8e8ec1abd5d85 (commit)
   via  be7b30f67e7e5c8b0186ba622dc06ce8ffe2df4e (commit)
   via  b323407235a3671eb11c7a039ce1c2f134025c73 (commit)
   via  9d20fe014f3b81fa7d7a3b7d203b58abe6fd5ce6 (commit)
   via  dfb2d6178e68379683a012c7c9306b851c1350a6 (commit)
   via  ba30b94435bc621767fb887d081a257cdec8a633 (commit)
   via  9c4cdc43f68c46984cbf7ce7d5f22aadcdde1a00 (commit)
  from  591899bc9643881610f665ac2e8787774a6b78b0 (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=24bee427b5da710c5f9941f5cddb455df1a2ea82
commit 24bee427b5da710c5f9941f5cddb455df1a2ea82
Merge: 9aef4a7 a376146
Author: Brad King 
AuthorDate: Thu Jan 31 16:10:44 2019 +
Commit: Kitware Robot 
CommitDate: Thu Jan 31 11:12:27 2019 -0500

Merge topic 'update-kwsys'

a37614667d Configure KWSys to honor CMake_NO_CXX_STANDARD
e3b26f0004 Merge branch 'upstream-KWSys' into update-kwsys
c22e373a30 KWSys 2019-01-30 (ce89cada)

Acked-by: Kitware Robot 
Merge-request: !2886


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9aef4a732ba6b0d20c9953d171514fa4c0daaddf
commit 9aef4a732ba6b0d20c9953d171514fa4c0daaddf
Merge: 1b3b0fa 9d20fe0
Author: Brad King 
AuthorDate: Thu Jan 31 16:09:54 2019 +
Commit: Kitware Robot 
CommitDate: Thu Jan 31 11:11:28 2019 -0500

Merge topic 'variables1'

9d20fe014f Help: moved 7 variables to "internal" section
dfb2d6178e Help: "internal variables" instead of "obsolete", with some 
explanatory prose
9c4cdc43f6 Help: declare CMAKE_HOME_DIRECTORY obsolete

Acked-by: Kitware Robot 
Merge-request: !2881


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1b3b0fa43a51aed03f38b98f30d9383bc6d377d6
commit 1b3b0fa43a51aed03f38b98f30d9383bc6d377d6
Merge: 74cba6a ec027aa
Author: Brad King 
AuthorDate: Thu Jan 31 16:09:46 2019 +
Commit: Kitware Robot 
CommitDate: Thu Jan 31 11:10:03 2019 -0500

Merge topic 'msys_docs'

ec027aa64a Help: Add documentation for MSYS variable

Acked-by: Kitware Robot 
Merge-request: !2882


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=74cba6a3fde29649a924bc54269ed3449743eb5f
commit 74cba6a3fde29649a924bc54269ed3449743eb5f
Merge: 591899b be7b30f
Author: Brad King 
AuthorDate: Thu Jan 31 16:08:09 2019 +
Commit: Kitware Robot 
CommitDate: Thu Jan 31 11:08:19 2019 -0500

Merge topic 'lapack-docs'

be7b30f67e Find{BLAS,LAPACK}: Add note and example for using Intel MKL
b323407235 Find{BLAS,LAPACK}: Update docs to use modern conventions
ba30b94435 FindLAPACK: Remove extra indentation from a line

Acked-by: Kitware Robot 
Merge-request: !2880


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a37614667d2a1d7d3e4db5e1ec8df644bfbe39fa
commit a37614667d2a1d7d3e4db5e1ec8df644bfbe39fa
Author: Brad King 
AuthorDate: Wed Jan 30 10:39:41 2019 -0500
Commit: Brad King 
CommitDate: Wed Jan 30 10:39:41 2019 -0500

Configure KWSys to honor CMake_NO_CXX_STANDARD

KWSys now computes a default `CMAKE_CXX_STANDARD` value if it is
not told what standard to use.  When `CMake_NO_CXX_STANDARD` is
enabled, tell KWSys not to do that.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 75a0b52..bd130ec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -332,6 +332,9 @@ macro (CMAKE_BUILD_UTILITIES)
   set(KWSYS_USE_ConsoleBuf 1)
   set(KWSYS_HEADER_ROOT ${CMake_BINARY_DIR}/Source)
   set(KWSYS_INSTALL_DOC_DIR "${CMAKE_DOC_DIR}")
+  if(CMake_NO_CXX_STANDARD)
+set(KWSYS_CXX_STANDARD "")
+  endif()
   add_subdirectory(Source/kwsys)
   set(kwsys_folder "Utilities/KWSys")
   CMAKE_SET_TARGET_FOLDER(${KWSYS_NAMESPACE} "${kwsys_folder}")

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e3b26f0004e20c11818e8c6cdd6c778c379d8c67
commit e3b26f0004e20c11818e8c6cdd6c778c379d8c67
Merge: 748d024 c22e373
Author: Brad King 
AuthorDate: Wed Jan 30 10:36:24 2019 -0500
Commit: Brad King 
CommitDate: Wed Jan 30 10:36:24 2019 -0500

Merge branch 'upstream-KWSys' into update-kwsys

* upstream-KWSys:

[Cmake-commits] CMake branch, master, updated. v3.13.3-1231-g591899b

2019-01-31 Thread Kitware Robot via Cmake-commits 
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  591899bc9643881610f665ac2e8787774a6b78b0 (commit)
   via  cba5b22db34c73c32653894d39888b44b9f25558 (commit)
   via  6f5e4a53bca7ce5c15b1d030ef99bb2b3a1b0d2e (commit)
   via  9eaa6aa599ebc4f380fbc36e352fd5ad25c5bcd7 (commit)
   via  bb735025dea634285a43b32b98af7ac25c5f8e76 (commit)
   via  91d98542d26318d8f51c434e689ccf6cddc2d3d0 (commit)
   via  062d21c36a57ad9c7528ea3f490595492853f1f8 (commit)
   via  17ac7c4024147386bd059523eff12951f3c0ef7d (commit)
   via  2df6d69014c8f8c0191dbf30d8c406225edbef3e (commit)
   via  b598dfb65edd75e0da763d36dcdc3d19016a8d27 (commit)
  from  5107a84d46ad245221843adbef092118649e6dc7 (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=591899bc9643881610f665ac2e8787774a6b78b0
commit 591899bc9643881610f665ac2e8787774a6b78b0
Merge: 9eaa6aa cba5b22
Author: Brad King 
AuthorDate: Thu Jan 31 16:01:35 2019 +
Commit: Kitware Robot 
CommitDate: Thu Jan 31 11:01:41 2019 -0500

Merge topic 'FindLAPACK-typo'

cba5b22db3 Merge branch 'backport-FindLAPACK-typo'
6f5e4a53bc FindLAPACK: Distinguish check result variable name from FindBLAS
bb735025de Find{BLAS,LAPACK}: Drop unnecessary mark_as_advanced calls

Acked-by: Kitware Robot 
Merge-request: !2897


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cba5b22db34c73c32653894d39888b44b9f25558
commit cba5b22db34c73c32653894d39888b44b9f25558
Merge: bb73502 6f5e4a5
Author: Brad King 
AuthorDate: Thu Jan 31 09:17:30 2019 -0500
Commit: Brad King 
CommitDate: Thu Jan 31 10:59:53 2019 -0500

Merge branch 'backport-FindLAPACK-typo'

Use the `-s ours` merge strategy to avoid conflicts.  Our side was
already fixed by commit 8b63265ea5 (FindLAPACK: Unify internal variables
related to MKL, 2018-11-18) as part of other work.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6f5e4a53bca7ce5c15b1d030ef99bb2b3a1b0d2e
commit 6f5e4a53bca7ce5c15b1d030ef99bb2b3a1b0d2e
Author: Brad King 
AuthorDate: Thu Jan 31 08:59:37 2019 -0500
Commit: Brad King 
CommitDate: Thu Jan 31 10:59:25 2019 -0500

FindLAPACK: Distinguish check result variable name from FindBLAS

Since commit 192a9182f8 (FindLAPACK: MKL clean up and fix for windows,
2013-10-08, v3.0.0-rc1~538^2), FindLAPACK accidentally used FindBLAS's
`BLAS_` prefix for some of its check results.

Since commit 5b8f69ebe9 (FindBLAS: Detect implicitly linked BLAS
library, 2018-08-28, v3.13.0-rc1~150^2~2), FindBLAS stores a check
result in a plain `BLAS_WORKS` variable.  The typo in FindLAPACK happens
to cause a collision with that name.

The typo was already fixed in post-3.13 development as part of other
work in commit 8b63265ea5 (FindLAPACK: Unify internal variables related
to MKL, 2018-11-18).  Fix the typo in the 3.13 version of FindLAPACK to
avoid the collision.  Otherwise it could cause FindLAPACK to incorrectly
determine that a certain library combination does not work (or
incrrectly that it works).

Fixes: #18860

diff --git a/Modules/FindLAPACK.cmake b/Modules/FindLAPACK.cmake
index 2c6145a..dc94079 100644
--- a/Modules/FindLAPACK.cmake
+++ b/Modules/FindLAPACK.cmake
@@ -316,7 +316,7 @@ if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All")
 if (NOT ${_LIBRARIES})
   check_lapack_libraries(
 ${_LIBRARIES}
-BLAS
+LAPACK
 ${LAPACK_mkl_SEARCH_SYMBOL}
 ""
 ""
@@ -329,7 +329,7 @@ if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All")
   if (NOT ${_LIBRARIES})
 check_lapack_libraries(
   ${_LIBRARIES}
-  BLAS
+  LAPACK
   ${LAPACK_mkl_SEARCH_SYMBOL}
   ""
   "${IT}"

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9eaa6aa599ebc4f380fbc36e352fd5ad25c5bcd7
commit 9eaa6aa599ebc4f380fbc36e352fd5ad25c5bcd7
Merge: 5107a84 91d9854
Author: Brad King 
AuthorDate: Thu Jan 31 15:58:15 2019 +
Commit: Kitware Robot 
CommitDate: Thu Jan 31 10:58:23 2019 -0500

Merge topic 'autogen-qt-version-from-dirprops'

91d98542d2 Merge branch 'autogen-qt-version-from-dirprops-release' into 
autogen-qt-version-from-dirprops-master
062d21c36a Autogen: Read the Qt version from directory properties as well
17ac7c4024 Tests: add cases for providing Qt5Core_VERSION manually
2df6d69014 AutoGen: query Qt5 version from directory properties
b598dfb65e Tests: add cases for providing Qt5Core_VERSION manually

Acked-by: Kitware Robot

[Cmake-commits] CMake branch, master, updated. v3.13.3-1221-g5107a84

2019-01-31 Thread Kitware Robot via Cmake-commits 
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  5107a84d46ad245221843adbef092118649e6dc7 (commit)
   via  9329e1e30ef4de637d0e71950933f1725f28b475 (commit)
   via  0779bc9393efeaf1bb3bbf35619617d317d37308 (commit)
   via  f64099cf5e5a659340cf221dd32a6cfa8bfe47d3 (commit)
   via  95210d027a03192532fcf2c71c98c79fd4cc0fd1 (commit)
   via  d9dd68cb60ed09e32cbda8bbd3e31c86a8778e66 (commit)
  from  8ea30a44d38057fed134532f6d3b6e8626a1ccff (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=5107a84d46ad245221843adbef092118649e6dc7
commit 5107a84d46ad245221843adbef092118649e6dc7
Merge: 9329e1e f64099c
Author: Brad King 
AuthorDate: Thu Jan 31 15:50:31 2019 +
Commit: Kitware Robot 
CommitDate: Thu Jan 31 10:50:38 2019 -0500

Merge topic 'restore-install-late-framework'

f64099cf5e Merge branch 'backport-restore-install-late-framework'
95210d027a macOS: Restore compatibility for setting FRAMEWORK after 
install()
d9dd68cb60 macOS: Restore compatibility for setting FRAMEWORK after 
install()

Acked-by: Kitware Robot 
Acked-by: Kyle Edwards 
Merge-request: !2878


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9329e1e30ef4de637d0e71950933f1725f28b475
commit 9329e1e30ef4de637d0e71950933f1725f28b475
Merge: 8ea30a4 0779bc9
Author: Brad King 
AuthorDate: Thu Jan 31 15:45:50 2019 +
Commit: Kitware Robot 
CommitDate: Thu Jan 31 10:45:56 2019 -0500

Merge topic 'readlistfile-stdstring'

0779bc9393 ReadListFile: Accept std::string argument

Acked-by: Kitware Robot 
Merge-request: !2889


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0779bc9393efeaf1bb3bbf35619617d317d37308
commit 0779bc9393efeaf1bb3bbf35619617d317d37308
Author: Vitaly Stakhovsky 
AuthorDate: Wed Jan 30 12:19:22 2019 -0500
Commit: Brad King 
CommitDate: Thu Jan 31 09:27:54 2019 -0500

ReadListFile: Accept std::string argument

diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index f9ac310..c2e0712 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -693,7 +693,7 @@ bool cmFindPackageCommand::FindModule(bool& found)
 std::string var = this->Name;
 var += "_FIND_MODULE";
 this->Makefile->AddDefinition(var, "1");
-bool result = this->ReadListFile(mfile.c_str(), DoPolicyScope);
+bool result = this->ReadListFile(mfile, DoPolicyScope);
 this->Makefile->RemoveDefinition(var);
 return result;
   }
@@ -776,7 +776,7 @@ bool cmFindPackageCommand::HandlePackageMode()
 this->StoreVersionFound();
 
 // Parse the configuration file.
-if (this->ReadListFile(this->FileFound.c_str(), DoPolicyScope)) {
+if (this->ReadListFile(this->FileFound, DoPolicyScope)) {
   // The package has been found.
   found = true;
 
@@ -1036,7 +1036,8 @@ bool cmFindPackageCommand::FindAppBundleConfig()
   return false;
 }
 
-bool cmFindPackageCommand::ReadListFile(const char* f, PolicyScopeRule psr)
+bool cmFindPackageCommand::ReadListFile(const std::string& f,
+PolicyScopeRule psr)
 {
   const bool noPolicyScope = !this->PolicyScope || psr == NoPolicyScope;
   if (this->Makefile->ReadDependentFile(f, noPolicyScope)) {
@@ -1590,7 +1591,7 @@ bool cmFindPackageCommand::CheckVersionFile(std::string 
const& version_file,
   // Load the version check file.  Pass NoPolicyScope because we do
   // our own policy push/pop independent of CMP0011.
   bool suitable = false;
-  if (this->ReadListFile(version_file.c_str(), NoPolicyScope)) {
+  if (this->ReadListFile(version_file, NoPolicyScope)) {
 // Check the output variables.
 bool okay = this->Makefile->IsOn("PACKAGE_VERSION_EXACT");
 bool unsuitable = this->Makefile->IsOn("PACKAGE_VERSION_UNSUITABLE");
diff --git a/Source/cmFindPackageCommand.h b/Source/cmFindPackageCommand.h
index 83d8431..a11d253 100644
--- a/Source/cmFindPackageCommand.h
+++ b/Source/cmFindPackageCommand.h
@@ -110,7 +110,7 @@ private:
 NoPolicyScope,
 DoPolicyScope
   };
-  bool ReadListFile(const char* f, PolicyScopeRule psr);
+  bool ReadListFile(const std::string& f, PolicyScopeRule psr);
   void StoreVersionFound();
 
   void ComputePrefixes();
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 2b627ff..8023298 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -437,7 +437,7 @@ bool cmake::SetCacheArgs(const std::vector& 
args)
 }
   }
   std::cout << "loading initial cache file " << path << "\n";
-  this->ReadListFile(args, path.c_str());
+

[Cmake-commits] CMake branch, master, updated. v3.13.3-1215-g8ea30a4

2019-01-31 Thread Kitware Robot via Cmake-commits 
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  8ea30a44d38057fed134532f6d3b6e8626a1ccff (commit)
   via  ea9a376085b22a6e19bb4c6334e186052db51f16 (commit)
  from  de7eb1a3d0e1389437a37513f566244344032c1e (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=8ea30a44d38057fed134532f6d3b6e8626a1ccff
commit 8ea30a44d38057fed134532f6d3b6e8626a1ccff
Merge: de7eb1a ea9a376
Author: Brad King 
AuthorDate: Thu Jan 31 14:26:58 2019 +
Commit: Kitware Robot 
CommitDate: Thu Jan 31 09:27:06 2019 -0500

Merge topic 'unused-members'

ea9a376085 Remove unused 'class cmake' members

Acked-by: Kitware Robot 
Merge-request: !2895


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ea9a376085b22a6e19bb4c6334e186052db51f16
commit ea9a376085b22a6e19bb4c6334e186052db51f16
Author: Brad King 
AuthorDate: Thu Jan 31 07:15:35 2019 -0500
Commit: Brad King 
CommitDate: Thu Jan 31 07:15:55 2019 -0500

Remove unused 'class cmake' members

* The `InTryCompile` member has been unused since commit 62854e9966
  (cmState: Move try_compile state from cmake class., 2015-04-11,
  v3.3.0-rc1~196^2~9).

* The `ConvertMessageType` and `IsMessageTypeVisible` members have been
  unused since commit 421012a330 (cmMessenger: Extract from cmake class,
  2016-01-28, v3.7.0-rc1~222^2~1).

* The `InitializeProperties` member has been unused since commit
  de722d7d63 (Move property initialization to cmState., 2015-04-06,
  v3.3.0-rc1~196^2~1).

Co-Author: Vitaly Stakhovsky 

diff --git a/Source/cmake.h b/Source/cmake.h
index afd4117..dd7ce42 100644
--- a/Source/cmake.h
+++ b/Source/cmake.h
@@ -443,7 +443,6 @@ public:
 
 protected:
   void RunCheckForUnusedVariables();
-  void InitializeProperties();
   int HandleDeleteCacheVariables(const std::string& var);
 
   typedef std::vector RegisteredGeneratorsVector;
@@ -486,7 +485,6 @@ protected:
 
 private:
   ProgressCallbackType ProgressCallback;
-  bool InTryCompile;
   WorkingMode CurrentWorkingMode;
   bool DebugOutput;
   bool Trace;
@@ -534,18 +532,6 @@ private:
 
   void AppendGlobalGeneratorsDocumentation(std::vector&);
   void AppendExtraGeneratorsDocumentation(std::vector&);
-
-  /**
-   * Convert a message type between a warning and an error, based on the state
-   * of the error output CMake variables, in the cache.
-   */
-  MessageType ConvertMessageType(MessageType t) const;
-
-  /*
-   * Check if messages of this type should be output, based on the state of the
-   * warning and error output CMake variables, in the cache.
-   */
-  bool IsMessageTypeVisible(MessageType t) const;
 };
 
 #define CMAKE_STANDARD_OPTIONS_TABLE  \

---

Summary of changes:
 Source/cmake.h | 14 --
 1 file changed, 14 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits

Re: [CMake] Checking Variables in a tool-chain file

2019-01-31 Thread Torsten 
Hi Sergei,

> Am 31.01.2019 um 08:42 schrieb Sergei Nikulov :
> 
> Just guessing maybe better use $ENV{ARM_GCC_TOOL_PATH} ?
> https://cmake.org/cmake/help/latest/variable/ENV.html?highlight=env

Well, but this would mean, I had to configure CMake not only with Cache 
variables:

cmake -DARM_GCC_TOOL_PATH=/usr/local/gcc-arm-none-eabi-7-2018-q2-update 
-DBINDING=nrf52 -DCMAKE_TOOLCHAIN_FILE=../cmake/gcc-arm-none-eabi.cmake 
-DNRF5_SDK_ROOT=~/CMSIS/nRF5_SDK_14-2/ ..

But also with environment variables:
ARM_GCC_TOOL_PATH=/usr/local/gcc-arm-none-eabi-7-2018-q2-update cmake 
-DBINDING=nrf52 -DCMAKE_TOOLCHAIN_FILE=../cmake/gcc-arm-none-eabi.cmake 
-DNRF5_SDK_ROOT=~/CMSIS/nRF5_SDK_14-2/ ..

Thanks for the pointer, I will think about it.

kind regards,
Torsten


signature.asc
Description: Message signed with OpenPGP
-- 

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