[Cmake-commits] CMake branch, master, updated. v3.4.0-rc1-188-g84c1d4f

2015-10-13 Thread Kitware Robot 
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  84c1d4f92056b847c804ced2b4a29f2c1eaba62b (commit)
  from  c4361a265b32acaa4a84c1ab14fecee1bfe49d33 (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=84c1d4f92056b847c804ced2b4a29f2c1eaba62b
commit 84c1d4f92056b847c804ced2b4a29f2c1eaba62b
Author: Kitware Robot <kwro...@kitware.com>
AuthorDate: Wed Oct 14 00:01:05 2015 -0400
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Oct 14 00:01:05 2015 -0400

CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 3ab2962..c57720a 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 4)
-set(CMake_VERSION_PATCH 20151013)
+set(CMake_VERSION_PATCH 20151014)
 #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
http://public.kitware.com/mailman/listinfo/cmake-commits

[cmake-developers] [CMake 0015785]: Support "generator expressions" in "install(CODE)"

2015-10-13 Thread Mantis Bug Tracker 

The following issue has been SUBMITTED. 
== 
https://public.kitware.com/Bug/view.php?id=15785 
== 
Reported By:SunBlack
Assigned To:
== 
Project:CMake
Issue ID:   15785
Category:   CMake
Reproducibility:always
Severity:   feature
Priority:   normal
Status: new
== 
Date Submitted: 2015-10-13 02:59 EDT
Last Modified:  2015-10-13 02:59 EDT
== 
Summary:Support "generator expressions" in "install(CODE)"
Description: 
With CMake 3.4 "install(FILES)" and "install(DIRECTORY)" learned to support
"generator expressions" in command "DESTINATION". But it would be helpful if
"install(CODE)" support "generator expressions" too.

An usecase could be:

INSTALL(CODE "
   include(BundleUtilities)
   fixup_bundle($ \"\" \"\")
   " COMPONENT Runtime
)

== 

Issue History 
Date ModifiedUsername   FieldChange   
== 
2015-10-13 02:59 SunBlack   New Issue
==

-- 

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:
http://public.kitware.com/mailman/listinfo/cmake-developers

Re: [CMake] CMAKE_BUILD_TYPE and exact control of compiler options

2015-10-13 Thread Dan Liew 
Hi,


> - If not, what is the best/official way to get exact control over the compiler
> and linker options used?

I had to do something similar recently where I didn't want
``-DNDEBUG`` to be in any of the configurations.

I used  ``CMAKE_USER_MAKE_RULES_OVERRIDE `` to set the path to file
containing overrides, this must be set before calling ``project()``

```
set(CMAKE_USER_MAKE_RULES_OVERRIDE
${CMAKE_CURRENT_SOURCE_DIR}/cmake/c_flags_override.cmake)
project(ABC C)
```

The contents of ``c_flags_override.cmake`` looks like this

```
if (("${CMAKE_C_COMPILER_ID}" MATCHES "Clang") OR
("${CMAKE_C_COMPILER_ID}" MATCHES "GNU"))
# Taken from Modules/Compiler/GNU.cmake but -DNDEBUG is removed
  set(CMAKE_C_FLAGS_INIT "")
  set(CMAKE_C_FLAGS_DEBUG_INIT "-g")
  set(CMAKE_C_FLAGS_MINSIZEREL_INIT "-Os")
  set(CMAKE_C_FLAGS_RELEASE_INIT "-O3")
  set(CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "-O2 -g")
else()
  message(FATAL_ERROR "Overrides not set for compiler ${CMAKE_C_COMPILER_ID}")
endif()
```

I'm not sure if this is really the correct route to go down though for
your use case.

Dan.
-- 

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:
http://public.kitware.com/mailman/listinfo/cmake

Re: [CMake] CMAKE_BUILD_TYPE and exact control of compiler options

2015-10-13 Thread René J . V . Bertin 
Dan Liew wrote:

> Hi,
> 
> 
>> - If not, what is the best/official way to get exact control over the
>> compiler and linker options used?
> 
> I had to do something similar recently where I didn't want
> ``-DNDEBUG`` to be in any of the configurations.
> 
> I used  ``CMAKE_USER_MAKE_RULES_OVERRIDE `` to set the path to file
> containing overrides, this must be set before calling ``project()``

> I'm not sure if this is really the correct route to go down though for
> your use case.

That wouldn't be impossible. A more generic way to achieve what you did, one 
that doesn't require patching "client" CMake files (which I find unacceptable):

Store the customised settings in a file (I'd call it cmake.initcache) and call 
cmake as

%> cmake -C./cmake.initcache "$@"

This is an approach I follow with a more basic building workflow of my own, one 
where I keep localised/customised settings (CC/CXX, CFLAGS/CXXFLAGS, LDFLAGS 
etc) in a ./wconfigure.env file, which is parsed by wrappers to configure and 
cmake. It's not a usual approach for MacPorts, though.

R.

-- 

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:
http://public.kitware.com/mailman/listinfo/cmake

Re: [cmake-developers] BUILD_TESTING when cross compiling

2015-10-13 Thread Brad King 
On 10/13/2015 01:17 AM, Geoffrey Viola wrote:
> Tests/CMakeLists.txt
[snip]
> run when it won't be able to run the code on the host machine?

Many of the tests end with a step that verifies that a built
executable can run.  Several tests build tools that generate
sources.  In both cases we expect to be testing for the host.

> What is the best way to make CTest run those tests with the
> GHS MULTI generator and not the default one?

One can configure CMake with

  -G 
  -D CMake_TEST_EXTERNAL_CMAKE=c:/path/to/cmake-build/bin/Debug

to tell it to run the test suite using the "cmake" tool in the
given directory.  That will test with the given generator instead
of trying to build CMake with it.

Some work would be needed to make this work for cross-compiling.
Essentially the tests of interest need to be ported to avoid
running anything on the host.

-Brad

-- 

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:
http://public.kitware.com/mailman/listinfo/cmake-developers

Re: [cmake-developers] GHS MULTI generator link with RUNTIME_OUTPUT_DIRECTORY patch

2015-10-13 Thread Brad King 
On 10/13/2015 01:06 AM, Geoffrey Viola wrote:
> Attached is a patch to allow the GHS MULTI
[snip]
> +  const char* runtimeOutputDir =
> +tg->GetProperty("RUNTIME_OUTPUT_DIRECTORY");

The generator should not have to deal with such properties directly.
There are internal APIs to get the output locations.  The have been
on cmTarget but are currently being moved to cmGeneratorTarget.  See
other generators for use of things like GetFullPath.

-Brad

-- 

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:
http://public.kitware.com/mailman/listinfo/cmake-developers

[cmake-developers] [CMake 0015787]: Please add note about change to 3.4 release notes

2015-10-13 Thread Mantis Bug Tracker 

The following issue has been SUBMITTED. 
== 
https://cmake.org/Bug/view.php?id=15787 
== 
Reported By:James Crosby
Assigned To:
== 
Project:CMake
Issue ID:   15787
Category:   CMake
Reproducibility:N/A
Severity:   major
Priority:   urgent
Status: new
== 
Date Submitted: 2015-10-13 08:31 EDT
Last Modified:  2015-10-13 08:31 EDT
== 
Summary:Please add note about  change to 3.4
release notes
Description: 
CMake 3.4 includes this change:
https://github.com/Kitware/CMake/commit/c736de7b284ecc93bac48106e88417e0e6c92ad6
which splits out  from  in the CMAKE_C_COMPILE_OBJECT command.

All toolchain descriptions which override this command need to be updated to
work correctly with CMake 3.4, but this is not clearly documented anywhere, it
seems like it should be a major item in the release notes!
== 

Issue History 
Date ModifiedUsername   FieldChange   
== 
2015-10-13 08:31 James Crosby   New Issue
==

-- 

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:
http://public.kitware.com/mailman/listinfo/cmake-developers

[cmake-developers] [CMake 0015786]: FindMatlab / matlab_add_mex does not work with 64-bit Matlab Version - Version detected as 32-bit Matlab

2015-10-13 Thread Mantis Bug Tracker 

The following issue has been SUBMITTED. 
== 
https://public.kitware.com/Bug/view.php?id=15786 
== 
Reported By:Kerstin Keller
Assigned To:
== 
Project:CMake
Issue ID:   15786
Category:   Modules
Reproducibility:always
Severity:   minor
Priority:   normal
Status: new
== 
Date Submitted: 2015-10-13 07:32 EDT
Last Modified:  2015-10-13 07:32 EDT
== 
Summary:FindMatlab / matlab_add_mex does not work with
64-bit Matlab Version - Version detected as 32-bit Matlab
Description: 
I have installed a 64bit Matlab Version (2015a) and CMake 3.3.2. 
When writing a simple CMakeLists.txt script

cmake_minimum_required(VERSION 3.3)
project(easy_example)
find_package(MATLAB REQUIRED)

include_directories(Matlab_INCLUDE_DIRS)

matlab_add_mex(
  NAME easy_example
  SRC easy_example.cpp
)

It cannot find the mex library. The Output is

-- Could NOT find Matlab (missing:  Matlab_MEX_LIBRARY) (found version "8.5")
CMake Error: The following variables are used in this project, but they are set
to NOTFOUND.
Please set them or make sure they are set and tested correctly in the CMake
files:
Matlab_MEX_LIBRARY
linked by target "easy_example" in directory
D:/SourceCode/Matlab/easy_example
-- Configuring incomplete, errors occurred!


Steps to Reproduce: 
Try to run 

find_package(MATLAB REQUIRED)

and then use

matlab_add_mex(
...
)

with a 64-bit Matlab Version.

Additional Information: 
Digging a little into the FindMatlab.cmake script, and outputted the directories
where it searches for the directories (l.1342).

message(STATUS "The include dir ${MATLAB_INCLUDE_DIR_TO_LOOK}")
message(STATUS "The library dir ${_matlab_lib_dir_for_search}")

This gives me the following Output

-- The include dir C:/LegacyApp/Matlab15a/R2015a_64bit/extern/include
-- The library dir
C:/LegacyApp/Matlab15a/R2015a_64bit/extern/lib/win32/microsoft

However, as my Matlab Version is 64bit, it library dir should be 
C:/LegacyApp/Matlab15a/R2015a_64bit/extern/lib/win64/microsoft

This can be traced back to line 1276, where I added another message Output:
if(_matlab_64Build)
  set(_matlab_current_suffix ${_matlab_bin_suffix_64bits})
  message(STATUS "64bit Matlab")
else()
  set(_matlab_current_suffix ${_matlab_bin_suffix_32bits})
  message(STATUS "32bit Matlab")
endif()

CMake falsely detects a 32bit Matlab Version
-- 32bit Matlab

== 

Issue History 
Date ModifiedUsername   FieldChange   
== 
2015-10-13 07:32 Kerstin Keller New Issue
==

-- 

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:
http://public.kitware.com/mailman/listinfo/cmake-developers

Re: [CMake] FindCUDA discard any previous value of CUDA_USE_STATIC_CUDA_RUNTIME

2015-10-13 Thread Thibaut Neiger 
Maybe we could make the FindCUDA script check if the caller defined that
variable prior to any inclusion. If the user did, then FindCUDA should
respect the caller choice.
Something like that would make the trick:

if(NOT DEFINED CUDA_USE_STATIC_CUDA_RUNTIME_FORCED)
  if(DEFINED CUDA_USE_STATIC_CUDA_RUNTIME)
set(CUDA_USE_STATIC_CUDA_RUNTIME_FORCED TRUE CACHE INTERNAL "If user
forced static cuda runtime variable.")
  else()
set(CUDA_USE_STATIC_CUDA_RUNTIME_FORCED FALSE CACHE INTERNAL "If user
forced static cuda runtime variable.")
  endif()
endif()
...
macro(cuda_unset_include_and_libraries)
  ...
  if(NOT CUDA_USE_STATIC_CUDA_RUNTIME_FORCED )
unset(CUDA_USE_STATIC_CUDA_RUNTIME CACHE)
  endif()
endmacro()


Le lun. 12 oct. 2015 à 14:32, James Bigler  a écrit :

> Whether you can use the static runtime is based on the toolkit found, so
> if you change the toolkit (checked with the CUDA_TOOLKIT_ROOT_DIR_INTERNAL
> variable) we need to reset all dependent values.
>
> I don't see a clean way to get this to work in the way you want.  The
> script can't tell the difference between you setting the value, and the
> value being there from a previous toolkit.
>
> I don't see the problem of this code:
>
>
> set(CUDA_TOOLKIT_ROOT_DIR "d:/work/CUDAToolkit")
> find_package(CUDA)
> unset(CUDA_USE_STATIC_CUDA_RUNTIME CACHE)
> option(CUDA_USE_STATIC_CUDA_RUNTIME OFF)
> find_package(CUDA)
>
> Or you could set the internal version of the
> CUDA_TOOLKIT_ROOT_DIR_INTERNAL at the same time you set the
> CUDA_TOOLKIT_ROOT_DIR:
>
> option(CUDA_USE_STATIC_CUDA_RUNTIME OFF)
> set(CUDA_TOOLKIT_ROOT_DIR "d:/work/CUDAToolkit")
> set(CUDA_TOOLKIT_ROOT_DIR_INTERNAL "${CUDA_TOOLKIT_ROOT_DIR}")
>
> message(STATUS CUDA_USE_STATIC_CUDA_RUNTIME=$
> {CUDA_USE_STATIC_CUDA_RUNTIME})
> find_package(CUDA)
>
> James
>
> On Tue, Oct 6, 2015 at 11:49 AM, Thibaut Neiger 
> wrote:
>
>> Hello.
>> I am using cmake 3.3.2.
>> The following script sets the CUDA_USE_STATIC_CUDA_RUNTIME option, then
>> finds the CUDA package.
>>
>> cmake_minimum_required(VERSION 3.3)
>> option(CUDA_USE_STATIC_CUDA_RUNTIME OFF)
>> set(CUDA_TOOLKIT_ROOT_DIR "d:/work/CUDAToolkit")
>> message(STATUS
>> CUDA_USE_STATIC_CUDA_RUNTIME=${CUDA_USE_STATIC_CUDA_RUNTIME})
>> find_package(CUDA)
>> message(STATUS
>> CUDA_USE_STATIC_CUDA_RUNTIME=${CUDA_USE_STATIC_CUDA_RUNTIME})
>>
>> In the find_package, the variable CUDA_TOOLKIT_ROOT_DIR is compared to
>> the variable CUDA_TOOLKIT_ROOT_DIR_INTERNAL (line 556). Since this variable
>> is not defined, the cuda_unset_include_and_libraries function is called.
>> This function wipes the CUDA_USE_STATIC_CUDA_RUNTIME option from the cache.
>>
>> In order to correctly set this variable, I need to restart change it back
>> to OFF, then the FindCUDA script doesn't call
>> cuda_unset_include_and_libraries function.
>> Thibaut.
>>
> --
>>
>> 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:
>> http://public.kitware.com/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:
http://public.kitware.com/mailman/listinfo/cmake

[CMake] C++11 flag not being added

2015-10-13 Thread Matthew S Wallace 
I have the following two lines in my CMakeLists.txt

set_property(GLOBAL PROPERTY CXX_STANDARD 11)
set_property(GLOBAL PROPERTY CXX_STANDARD_REQUIRED)

However when compiling some of my source files, the -std=c++11 flag is not 
added.

Just for good measure I added:
target_compile_features(my_target PRIVATE cxx_strong_enums) to the target that 
was having the problem.

Not sure if it matters, but in this case the compile error I’m getting is 
complaining because I’m referencing a fully scoped enum.  If I explicitly 
include -std=c++11 in my compile flags, everything works.

I’m thinking I’m probably just misunderstanding how CXX_STANDARD works, but any 
help would be appreciated.

-Matt
-- 

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:
http://public.kitware.com/mailman/listinfo/cmake

[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-503-g7db9307

2015-10-13 Thread Nils Gladitz 
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, next has been updated
   via  7db9307dfdf5f2e6713f6a41d688d09a4dc8bd56 (commit)
   via  5a266095ee778fb700c067c55ff0b59777a72c50 (commit)
  from  be129b862a878c9154d601603dc20e7d3cc24bf6 (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=7db9307dfdf5f2e6713f6a41d688d09a4dc8bd56
commit 7db9307dfdf5f2e6713f6a41d688d09a4dc8bd56
Merge: be129b8 5a26609
Author: Nils Gladitz 
AuthorDate: Tue Oct 13 10:27:24 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Oct 13 10:27:24 2015 -0400

Merge topic 'wix-text-node' into next

5a266095 CPackWIX: Handle text nodes in XML patch content


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5a266095ee778fb700c067c55ff0b59777a72c50
commit 5a266095ee778fb700c067c55ff0b59777a72c50
Author: Nils Gladitz 
AuthorDate: Mon Oct 12 21:53:08 2015 +0200
Commit: Nils Gladitz 
CommitDate: Mon Oct 12 21:53:08 2015 +0200

CPackWIX: Handle text nodes in XML patch content

diff --git a/Source/CPack/WiX/cmWIXPatch.cxx b/Source/CPack/WiX/cmWIXPatch.cxx
index 5a8dc63..471c3a4 100644
--- a/Source/CPack/WiX/cmWIXPatch.cxx
+++ b/Source/CPack/WiX/cmWIXPatch.cxx
@@ -33,13 +33,30 @@ void cmWIXPatch::ApplyFragment(
   if(i == Fragments.end()) return;
 
   const cmWIXPatchElement& fragment = i->second;
+
+  this->ApplyElementChildren(fragment, writer);
+
+  Fragments.erase(i);
+}
+
+void cmWIXPatch::ApplyElementChildren(
+  const cmWIXPatchElement& element, cmWIXSourceWriter& writer)
+{
   for(cmWIXPatchElement::child_list_t::const_iterator
-j = fragment.children.begin(); j != fragment.children.end(); ++j)
+j = element.children.begin(); j != element.children.end(); ++j)
+  {
+  cmWIXPatchNode *node = *j;
+
+  switch(node->type())
 {
-ApplyElement(**j, writer);
+case cmWIXPatchNode::ELEMENT:
+  ApplyElement(dynamic_cast(*node), writer);
+  break;
+case cmWIXPatchNode::TEXT:
+  writer.AddTextNode(dynamic_cast(*node).text);
+  break;
 }
-
-  Fragments.erase(i);
+  }
 }
 
 void cmWIXPatch::ApplyElement(
@@ -53,16 +70,11 @@ void cmWIXPatch::ApplyElement(
 writer.AddAttribute(i->first, i->second);
 }
 
-  for(cmWIXPatchElement::child_list_t::const_iterator
-i = element.children.begin(); i != element.children.end(); ++i)
-{
-ApplyElement(**i, writer);
-}
+  this->ApplyElementChildren(element, writer);
 
   writer.EndElement(element.name);
 }
 
-
 bool cmWIXPatch::CheckForUnappliedFragments()
 {
   std::string fragmentList;
diff --git a/Source/CPack/WiX/cmWIXPatch.h b/Source/CPack/WiX/cmWIXPatch.h
index 7b7b2f1..d53fcb4 100644
--- a/Source/CPack/WiX/cmWIXPatch.h
+++ b/Source/CPack/WiX/cmWIXPatch.h
@@ -33,6 +33,9 @@ public:
   bool CheckForUnappliedFragments();
 
 private:
+  void ApplyElementChildren(const cmWIXPatchElement& element,
+cmWIXSourceWriter& writer);
+
   void ApplyElement(const cmWIXPatchElement& element,
 cmWIXSourceWriter& writer);
 
diff --git a/Source/CPack/WiX/cmWIXPatchParser.cxx 
b/Source/CPack/WiX/cmWIXPatchParser.cxx
index e066c28..14c5413 100644
--- a/Source/CPack/WiX/cmWIXPatchParser.cxx
+++ b/Source/CPack/WiX/cmWIXPatchParser.cxx
@@ -16,6 +16,21 @@
 
 #include 
 
+cmWIXPatchNode::Type cmWIXPatchText::type()
+{
+  return cmWIXPatchNode::TEXT;
+}
+
+cmWIXPatchNode::Type cmWIXPatchElement::type()
+{
+  return cmWIXPatchNode::ELEMENT;
+}
+
+cmWIXPatchNode::~cmWIXPatchNode()
+{
+
+}
+
 cmWIXPatchElement::~cmWIXPatchElement()
 {
   for(child_list_t::iterator i = children.begin(); i != children.end(); ++i)
@@ -63,20 +78,20 @@ void cmWIXPatchParser::StartElement(const std::string& 
name, const char **atts)
 {
   cmWIXPatchElement  = *ElementStack.back();
 
-  parent.children.resize(parent.children.size() + 1);
-  cmWIXPatchElement*& currentElement = parent.children.back();
-  currentElement = new cmWIXPatchElement;
-  currentElement->name = name;
+  cmWIXPatchElement *element = new cmWIXPatchElement;
+  parent.children.push_back(element);
+
+  element->name = name;
 
   for(size_t i = 0; atts[i]; i += 2)
 {
 std::string key = atts[i];
 std::string value = atts[i+1];
 
-currentElement->attributes[key] = value;
+element->attributes[key] = value;
 }
 
-  ElementStack.push_back(currentElement);
+  ElementStack.push_back(element);
 }
 }
 
@@ -117,11 +132,34 @@ void cmWIXPatchParser::EndElement(const std::string& name)
 }
   else
 {
-

Re: [CMake] FindCUDA discard any previous value of CUDA_USE_STATIC_CUDA_RUNTIME

2015-10-13 Thread James Bigler 
Yeah, I thought about this method yesterday, but I'm not really excited
about this approach.  It adds yet another variable for the configuration
that doesn't really match the others.  Granted the behavior of the other
FindCUDA options allow setting it before the first FindCUDA invocation, so
there is already the loss of symmetry.

If you were to do this from the GUI, you would configure once, change the
defaults to your liking and configure a second time.  You would only need
this FORCED version of the variable to bypass the default behavior and only
on the first configure.

I'll need to consider this some more.

I'm not trying to dissuade you from wanting the shared version of cudart,
but why isn't the static library desirable in your case?  You can reply
just to me if you want.

On Tue, Oct 13, 2015 at 8:51 AM Thibaut Neiger 
wrote:

> Maybe we could make the FindCUDA script check if the caller defined that
> variable prior to any inclusion. If the user did, then FindCUDA should
> respect the caller choice.
> Something like that would make the trick:
>
> if(NOT DEFINED CUDA_USE_STATIC_CUDA_RUNTIME_FORCED)
>   if(DEFINED CUDA_USE_STATIC_CUDA_RUNTIME)
> set(CUDA_USE_STATIC_CUDA_RUNTIME_FORCED TRUE CACHE INTERNAL "If user
> forced static cuda runtime variable.")
>   else()
> set(CUDA_USE_STATIC_CUDA_RUNTIME_FORCED FALSE CACHE INTERNAL "If user
> forced static cuda runtime variable.")
>   endif()
> endif()
> ...
> macro(cuda_unset_include_and_libraries)
>   ...
>   if(NOT CUDA_USE_STATIC_CUDA_RUNTIME_FORCED )
> unset(CUDA_USE_STATIC_CUDA_RUNTIME CACHE)
>   endif()
> endmacro()
>
>
> Le lun. 12 oct. 2015 à 14:32, James Bigler  a
> écrit :
>
>> Whether you can use the static runtime is based on the toolkit found, so
>> if you change the toolkit (checked with the CUDA_TOOLKIT_ROOT_DIR_INTERNAL
>> variable) we need to reset all dependent values.
>>
>> I don't see a clean way to get this to work in the way you want.  The
>> script can't tell the difference between you setting the value, and the
>> value being there from a previous toolkit.
>>
>> I don't see the problem of this code:
>>
>>
>> set(CUDA_TOOLKIT_ROOT_DIR "d:/work/CUDAToolkit")
>> find_package(CUDA)
>> unset(CUDA_USE_STATIC_CUDA_RUNTIME CACHE)
>> option(CUDA_USE_STATIC_CUDA_RUNTIME OFF)
>> find_package(CUDA)
>>
>> Or you could set the internal version of the
>> CUDA_TOOLKIT_ROOT_DIR_INTERNAL at the same time you set the
>> CUDA_TOOLKIT_ROOT_DIR:
>>
>> option(CUDA_USE_STATIC_CUDA_RUNTIME OFF)
>> set(CUDA_TOOLKIT_ROOT_DIR "d:/work/CUDAToolkit")
>> set(CUDA_TOOLKIT_ROOT_DIR_INTERNAL "${CUDA_TOOLKIT_ROOT_DIR}")
>>
>> message(STATUS CUDA_USE_STATIC_CUDA_RUNTIME=$
>> {CUDA_USE_STATIC_CUDA_RUNTIME})
>> find_package(CUDA)
>>
>> James
>>
>> On Tue, Oct 6, 2015 at 11:49 AM, Thibaut Neiger > > wrote:
>>
>>> Hello.
>>> I am using cmake 3.3.2.
>>> The following script sets the CUDA_USE_STATIC_CUDA_RUNTIME option, then
>>> finds the CUDA package.
>>>
>>> cmake_minimum_required(VERSION 3.3)
>>> option(CUDA_USE_STATIC_CUDA_RUNTIME OFF)
>>> set(CUDA_TOOLKIT_ROOT_DIR "d:/work/CUDAToolkit")
>>> message(STATUS
>>> CUDA_USE_STATIC_CUDA_RUNTIME=${CUDA_USE_STATIC_CUDA_RUNTIME})
>>> find_package(CUDA)
>>> message(STATUS
>>> CUDA_USE_STATIC_CUDA_RUNTIME=${CUDA_USE_STATIC_CUDA_RUNTIME})
>>>
>>> In the find_package, the variable CUDA_TOOLKIT_ROOT_DIR is compared to
>>> the variable CUDA_TOOLKIT_ROOT_DIR_INTERNAL (line 556). Since this variable
>>> is not defined, the cuda_unset_include_and_libraries function is called.
>>> This function wipes the CUDA_USE_STATIC_CUDA_RUNTIME option from the cache.
>>>
>>> In order to correctly set this variable, I need to restart change it
>>> back to OFF, then the FindCUDA script doesn't call
>>> cuda_unset_include_and_libraries function.
>>> Thibaut.
>>>
>> --
>>>
>>> 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:
>>> http://public.kitware.com/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:

Re: [cmake-developers] ITK NIfTI broken Oct 6

2015-10-13 Thread Brad King 
On 10/12/2015 01:48 PM, Stephen Kelly wrote:
>  Subdirs: Initialize from parent before configuring.
>  https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7dac31b2

It seems that problem was covering another one:

 CMake Error: File 
/.../Modules/ThirdParty/GDCM/src/gdcm/Source/gdcmByteValue.cxx does not exist.
 CMake Error at 
Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/CMakeLists.txt:27
 (configure_file):
   configure_file Problem configuring file

The actual source file that exists is:

 
Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmByteValue.cxx

The configure_file call is:

 configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/${src}
${CMAKE_CURRENT_BINARY_DIR}/strict_${src}
COPYONLY
)

Therefore we see that CMAKE_CURRENT_SOURCE_DIR is incorrectly set.
This CMakeLists.txt file is again entered by the subdirs() command
in the parent directory.

Bisecting this required cherry-picking the above fix onto every
version tested.  However, the result points to:

 Set the current dirs on the snapshot before creating the cmMakefile.
 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=360e4e1d

as the culprit.

-Brad
-- 

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:
http://public.kitware.com/mailman/listinfo/cmake-developers

Re: [CMake] C++11 flag not being added

2015-10-13 Thread Petr Bena 
I would also like to know this, right now I do this and it works, but
it produced warnings on MSVC, so I did this nasty patch:

if(WIN32)
if(MINGW)
SET(CMAKE_CXX_FLAGS "-mwindows -std=c++11")
endif()
else()
SET(CMAKE_CXX_FLAGS "-std=c++11")
endif()

however doing just the SET statement itself should work

On Tue, Oct 13, 2015 at 5:22 PM, Matthew S Wallace
 wrote:
> I have the following two lines in my CMakeLists.txt
>
> set_property(GLOBAL PROPERTY CXX_STANDARD 11)
> set_property(GLOBAL PROPERTY CXX_STANDARD_REQUIRED)
>
> However when compiling some of my source files, the -std=c++11 flag is not 
> added.
>
> Just for good measure I added:
> target_compile_features(my_target PRIVATE cxx_strong_enums) to the target 
> that was having the problem.
>
> Not sure if it matters, but in this case the compile error I’m getting is 
> complaining because I’m referencing a fully scoped enum.  If I explicitly 
> include -std=c++11 in my compile flags, everything works.
>
> I’m thinking I’m probably just misunderstanding how CXX_STANDARD works, but 
> any help would be appreciated.
>
> -Matt
> --
>
> 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:
> http://public.kitware.com/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:
http://public.kitware.com/mailman/listinfo/cmake

Re: [CMake] C++11 flag not being added

2015-10-13 Thread Johannes Zarl-Zierl 
Hi,

CXX_STANDARD is a target property, not a global one. You can either set 
CXX_STANDARD for every target that needs it, or set it globally by changing 
the default value.

You can do the latter by setting the variable CMAKE_CXX_STANDARD  before 
defining any target that depends on it:

set(CMAKE_CXX_STANDARD 11)

HTH,
  Johannes

On Tuesday 13 October 2015 10:22:36 Matthew S Wallace wrote:
> I have the following two lines in my CMakeLists.txt
> 
> set_property(GLOBAL PROPERTY CXX_STANDARD 11)
> set_property(GLOBAL PROPERTY CXX_STANDARD_REQUIRED)
> 
> However when compiling some of my source files, the -std=c++11 flag is not
> added.
> 
> Just for good measure I added:
> target_compile_features(my_target PRIVATE cxx_strong_enums) to the target
> that was having the problem.
> 
> Not sure if it matters, but in this case the compile error I’m getting is
> complaining because I’m referencing a fully scoped enum.  If I explicitly
> include -std=c++11 in my compile flags, everything works.
> 
> I’m thinking I’m probably just misunderstanding how CXX_STANDARD works, but
> any help would be appreciated.
> 
> -Matt

-- 

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:
http://public.kitware.com/mailman/listinfo/cmake

[cmake-developers] [CMake 0015788]: Error during export target, which has additional defined include directories with target_include_directories

2015-10-13 Thread Mantis Bug Tracker 

The following issue has been SUBMITTED. 
== 
https://public.kitware.com/Bug/view.php?id=15788 
== 
Reported By:SunBlack
Assigned To:
== 
Project:CMake
Issue ID:   15788
Category:   CMake
Reproducibility:always
Severity:   minor
Priority:   normal
Status: new
== 
Date Submitted: 2015-10-13 11:47 EDT
Last Modified:  2015-10-13 11:47 EDT
== 
Summary:Error during export target, which has additional
defined include directories with target_include_directories
Description: 
If you have a static library and want to add necessary include directories with
target_include_directories so users of this library just need to add library
with target_link_libraries (and don't need to add includes with
include_directories), I currently got

%%Configuring done
CMake Error in CMakeLists.txt:
  Target "myProject" INTERFACE_INCLUDE_DIRECTORIES property contains path:

"D:/myProjectDir/myIncludeDir"

  which is prefixed in the source directory.


Generating done%%

Source code:
%%cmake_minimum_required(VERSION 3.3)

project(myProject)

add_library(${PROJECT_NAME}
mySourceDir/test.cpp
myIncludeDir/test.h
)

target_include_directories(${PROJECT_NAME} PUBLIC "myIncludeDir")

install(TARGETS ${PROJECT_NAME}
EXPORT MyTargets
ARCHIVE DESTINATION lib
)

install(EXPORT MyTargets DESTINATION cmake)%%

This message don't occurs, if I remove install.

== 

Issue History 
Date ModifiedUsername   FieldChange   
== 
2015-10-13 11:47 SunBlack   New Issue
==

-- 

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:
http://public.kitware.com/mailman/listinfo/cmake-developers

[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-505-g12fcad5

2015-10-13 Thread Brad King 
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, next has been updated
   via  12fcad5764d82276a98b5f1b22de34ac5ea77144 (commit)
   via  609a8921e7a830db01830ee572ed60d9f5574b14 (commit)
  from  7db9307dfdf5f2e6713f6a41d688d09a4dc8bd56 (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=12fcad5764d82276a98b5f1b22de34ac5ea77144
commit 12fcad5764d82276a98b5f1b22de34ac5ea77144
Merge: 7db9307 609a892
Author: Brad King 
AuthorDate: Tue Oct 13 11:49:01 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Oct 13 11:49:01 2015 -0400

Merge topic 'doc-INCLUDES-relnote' into next

609a8921 Help: Add release note about compile rule placeholder changes 
(#15787)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=609a8921e7a830db01830ee572ed60d9f5574b14
commit 609a8921e7a830db01830ee572ed60d9f5574b14
Author: Brad King 
AuthorDate: Tue Oct 13 11:44:59 2015 -0400
Commit: Brad King 
CommitDate: Tue Oct 13 11:44:59 2015 -0400

Help: Add release note about compile rule placeholder changes (#15787)

The change made by commit v3.4.0-rc1~342^2 (Factor an 
placeholder out of  in rule variables, 2015-07-13) affects an
internal interface.  Since it is commonly used by projects anyway, add a
release note covering the change in placeholders.

diff --git a/Help/release/3.4.rst b/Help/release/3.4.rst
index 495391a..89c5561 100644
--- a/Help/release/3.4.rst
+++ b/Help/release/3.4.rst
@@ -267,3 +267,7 @@ Other Changes
   created with the :command:`add_library` command.  ``MODULE``
   libraries are meant for explicit dynamic loading at runtime.
   They cannot be linked so ``SONAME`` is not useful.
+
+* The internal :variable:`CMAKE__COMPILE_OBJECT` rule variable now
+  substitutes compiler include flags in a separate  placeholder
+  instead of the main  placeholder.

---

Summary of changes:
 Help/release/3.4.rst |4 
 1 file changed, 4 insertions(+)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, master, updated. v3.4.0-rc1-181-gfc04b8f

2015-10-13 Thread Brad King 
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  fc04b8f4b8ebb53b19c0430ac992baa46c75d2e9 (commit)
   via  609a8921e7a830db01830ee572ed60d9f5574b14 (commit)
  from  d75971b5af8b2e48a14bc1363826a555c77eed2d (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=fc04b8f4b8ebb53b19c0430ac992baa46c75d2e9
commit fc04b8f4b8ebb53b19c0430ac992baa46c75d2e9
Merge: d75971b 609a892
Author: Brad King 
AuthorDate: Tue Oct 13 13:50:58 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Oct 13 13:50:58 2015 -0400

Merge topic 'doc-INCLUDES-relnote'

609a8921 Help: Add release note about compile rule placeholder changes 
(#15787)


---

Summary of changes:
 Help/release/3.4.rst |4 
 1 file changed, 4 insertions(+)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, master, updated. v3.4.0-rc1-177-g242d664

2015-10-13 Thread Brad King 
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  242d664f748baad810ae47aef91fc11475647f98 (commit)
   via  24aafbde115647b7e599d112d0bcc4f03c3e9b88 (commit)
  from  3d9cf05d2a1dc0ad191c15145ad7648cd77e18d6 (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=242d664f748baad810ae47aef91fc11475647f98
commit 242d664f748baad810ae47aef91fc11475647f98
Merge: 3d9cf05 24aafbd
Author: Brad King 
AuthorDate: Tue Oct 13 13:50:54 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Oct 13 13:50:54 2015 -0400

Merge topic 'xcode-adjust-deployment-to-host-version'

24aafbde Xcode: Adjust deployment target SDK version to host version


---

Summary of changes:
 Modules/Platform/Darwin-Initialize.cmake |4 
 1 file changed, 4 insertions(+)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, master, updated. v3.4.0-rc1-179-gd75971b

2015-10-13 Thread Brad King 
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  d75971b5af8b2e48a14bc1363826a555c77eed2d (commit)
   via  5225e0048c2b734eba7b03e396f89e74214daa66 (commit)
  from  242d664f748baad810ae47aef91fc11475647f98 (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=d75971b5af8b2e48a14bc1363826a555c77eed2d
commit d75971b5af8b2e48a14bc1363826a555c77eed2d
Merge: 242d664 5225e00
Author: Brad King 
AuthorDate: Tue Oct 13 13:50:56 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Oct 13 13:50:56 2015 -0400

Merge topic 'FindPostgreSQL-v9.5'

5225e004 FindPostgreSQL: Search for version 9.5


---

Summary of changes:
 Modules/FindPostgreSQL.cmake |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, master, updated. v3.4.0-rc1-183-gd6af556

2015-10-13 Thread Brad King 
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  d6af5566e8c07b6b47ac78b1652c29dbe0e31aa2 (commit)
   via  57f701a7f045fc13807933860bad22fa405c6621 (commit)
  from  fc04b8f4b8ebb53b19c0430ac992baa46c75d2e9 (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=d6af5566e8c07b6b47ac78b1652c29dbe0e31aa2
commit d6af5566e8c07b6b47ac78b1652c29dbe0e31aa2
Merge: fc04b8f 57f701a
Author: Brad King 
AuthorDate: Tue Oct 13 13:51:00 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Oct 13 13:51:00 2015 -0400

Merge topic 'FindGit-Atlassian-SourceTree'

57f701a7 FindGit: Search in 'Atlassian SourceTree' user directory (#15758)


---

Summary of changes:
 Modules/FindGit.cmake |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[cmake-developers] genex-generator-objects topic

2015-10-13 Thread Brad King 
Steve,

Last night's RunCMake.include test failures bisect to:

 cmMakefile: Store container of cmExportBuildFileGenerators.
 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5925f99c

A clang sanitizer build output is below.  Please take a look.

Thanks,
-Brad


WRITE of size 8 at 0x611aee80 thread T0
#0 0xcfeff3 in cmExportBuildFileGenerator::Compute(cmLocalGenerator*) 
/.../Source/cmExportBuildFileGenerator.cxx:29:12
#1 0xeb18a4 in cmGlobalGenerator::ComputeBuildFileGenerators() 
/.../Source/cmGlobalGenerator.cxx:1238:7
#2 0xeb1c6d in cmGlobalGenerator::Compute() 
/.../Source/cmGlobalGenerator.cxx:1272:3
#3 0xa2cac5 in cmake::Generate() /.../Source/cmake.cxx:1609:8
#4 0xa28abd in cmake::Run(std::vector const&, bool) /.../Source/cmake.cxx:1596:9
#5 0x7809bc in do_cmake(int, char const* const*) 
/.../Source/cmakemain.cxx:330:13
#6 0x77e002 in main /.../Source/cmakemain.cxx:190:13
#7 0x7f7185ab2ec4 in __libc_start_main 
/build/buildd/eglibc-2.19/csu/libc-start.c:287
#8 0x6b5e57 in _start (/home/kitware/My 
Builds/cmake-build-clang/bin/cmake+0x6b5e57)

0x611aee80 is located 192 bytes inside of 200-byte region 
[0x611aedc0,0x611aee88)
freed by thread T0 here:
#0 0x77bab0 in operator delete(void*) 
/projects/llvm/projects/compiler-rt/lib/asan/asan_new_delete.cc:94
#1 0xd04441 in cmExportBuildFileGenerator::~cmExportBuildFileGenerator() 
/.../Source/cmExportBuildFileGenerator.h:29:7
#2 0xe9a810 in cmGlobalGenerator::GenerateImportFile(std::string const&) 
/.../Source/cmGlobalGenerator.cxx:237:5
#3 0xbbe513 in cmIncludeCommand::InitialPass(std::vector const&, cmExecutionStatus&) 
/.../Source/cmIncludeCommand.cxx:130:5
#4 0xb5a963 in cmCommand::InvokeInitialPass(std::vector const&, cmExecutionStatus&) 
/.../Source/cmCommand.h:68:12
#5 0x84dadc in cmMakefile::ExecuteCommand(cmListFileFunction const&, 
cmExecutionStatus&) /.../Source/cmMakefile.cxx:321:11
#6 0x8517fb in cmMakefile::ReadListFile(cmListFile const&, std::string 
const&) /.../Source/cmMakefile.cxx:627:5
#7 0x861379 in cmMakefile::Configure() /.../Source/cmMakefile.cxx:1683:3
#8 0x861eef in cmMakefile::ConfigureSubDirectory(cmMakefile*) 
/.../Source/cmMakefile.cxx:1746:3
#9 0x862d97 in cmMakefile::AddSubDirectory(std::string const&, std::string 
const&, bool, bool) /.../Source/cmMakefile.cxx:1785:5
#10 0xac8f74 in 
cmAddSubDirectoryCommand::InitialPass(std::vector const&, cmExecutionStatus&) 
/.../Source/cmAddSubDirectoryCommand.cxx:124:3
#11 0xb5a963 in 
cmCommand::InvokeInitialPass(std::vector const&, cmExecutionStatus&) 
/.../Source/cmCommand.h:68:12
#12 0x84dadc in cmMakefile::ExecuteCommand(cmListFileFunction const&, 
cmExecutionStatus&) /.../Source/cmMakefile.cxx:321:11
#13 0x8517fb in cmMakefile::ReadListFile(cmListFile const&, std::string 
const&) /.../Source/cmMakefile.cxx:627:5
#14 0x850bff in cmMakefile::ReadDependentFile(char const*, bool) 
/.../Source/cmMakefile.cxx:537:3
#15 0xbbe794 in cmIncludeCommand::InitialPass(std::vector const&, cmExecutionStatus&) 
/.../Source/cmIncludeCommand.cxx:146:5
#16 0xb5a963 in 
cmCommand::InvokeInitialPass(std::vector const&, cmExecutionStatus&) 
/.../Source/cmCommand.h:68:12
#17 0x84dadc in cmMakefile::ExecuteCommand(cmListFileFunction const&, 
cmExecutionStatus&) /.../Source/cmMakefile.cxx:321:11
#18 0x8517fb in cmMakefile::ReadListFile(cmListFile const&, std::string 
const&) /.../Source/cmMakefile.cxx:627:5
#19 0x861379 in cmMakefile::Configure() /.../Source/cmMakefile.cxx:1683:3
#20 0xea61e2 in cmGlobalGenerator::Configure() 
/.../Source/cmGlobalGenerator.cxx:1126:3
#21 0xa26b6b in cmake::ActualConfigure() /.../Source/cmake.cxx:1418:3
#22 0xa2484c in cmake::Configure() /.../Source/cmake.cxx:1201:13
#23 0xa28a82 in cmake::Run(std::vector const&, bool) /.../Source/cmake.cxx:1575:13
#24 0x7809bc in do_cmake(int, char const* const*) 
/.../Source/cmakemain.cxx:330:13
#25 0x77e002 in main /.../Source/cmakemain.cxx:190:13
#26 0x7f7185ab2ec4 in __libc_start_main 
/build/buildd/eglibc-2.19/csu/libc-start.c:287

previously allocated by thread T0 here:
#0 0x77b470 in operator new(unsigned long) 
/projects/llvm/projects/compiler-rt/lib/asan/asan_new_delete.cc:62
#1 0xc5300c in cmExportCommand::InitialPass(std::vector const&, cmExecutionStatus&) 
/.../Source/cmExportCommand.cxx:212:38
#2 0xb5a963 in cmCommand::InvokeInitialPass(std::vector const&, cmExecutionStatus&) 
/.../Source/cmCommand.h:68:12
#3 0x84dadc in cmMakefile::ExecuteCommand(cmListFileFunction const&, 
cmExecutionStatus&)

[Cmake-commits] CMake branch, master, updated. v3.4.0-rc1-187-gc4361a2

2015-10-13 Thread Brad King 
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  c4361a265b32acaa4a84c1ab14fecee1bfe49d33 (commit)
   via  be616c189d969f9f984356bd052e3b5f39290771 (commit)
   via  f13030cb5bdf6f91abf0e625fa0b4d2993ca4217 (commit)
   via  4f8d58f97ac82eec6bf0f2d63f4a25a6fa447716 (commit)
  from  d6af5566e8c07b6b47ac78b1652c29dbe0e31aa2 (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:


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-516-g2ee565e

2015-10-13 Thread Brad King 
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, next has been updated
   via  2ee565e6f2795a90b7a4821cda7cbf23070efa5a (commit)
   via  c4361a265b32acaa4a84c1ab14fecee1bfe49d33 (commit)
   via  be616c189d969f9f984356bd052e3b5f39290771 (commit)
   via  f13030cb5bdf6f91abf0e625fa0b4d2993ca4217 (commit)
   via  4f8d58f97ac82eec6bf0f2d63f4a25a6fa447716 (commit)
  from  a177b8586863744f774579f744afd400404993df (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=2ee565e6f2795a90b7a4821cda7cbf23070efa5a
commit 2ee565e6f2795a90b7a4821cda7cbf23070efa5a
Merge: a177b85 c4361a2
Author: Brad King 
AuthorDate: Tue Oct 13 13:52:36 2015 -0400
Commit: Brad King 
CommitDate: Tue Oct 13 13:52:36 2015 -0400

Merge branch 'master' into next


---

Summary of changes:


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-511-ga177b85

2015-10-13 Thread Brad King 
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, next has been updated
   via  a177b8586863744f774579f744afd400404993df (commit)
   via  d6af5566e8c07b6b47ac78b1652c29dbe0e31aa2 (commit)
   via  fc04b8f4b8ebb53b19c0430ac992baa46c75d2e9 (commit)
   via  d75971b5af8b2e48a14bc1363826a555c77eed2d (commit)
   via  242d664f748baad810ae47aef91fc11475647f98 (commit)
   via  3d9cf05d2a1dc0ad191c15145ad7648cd77e18d6 (commit)
  from  12fcad5764d82276a98b5f1b22de34ac5ea77144 (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=a177b8586863744f774579f744afd400404993df
commit a177b8586863744f774579f744afd400404993df
Merge: 12fcad5 d6af556
Author: Brad King 
AuthorDate: Tue Oct 13 13:51:19 2015 -0400
Commit: Brad King 
CommitDate: Tue Oct 13 13:51:19 2015 -0400

Merge branch 'master' into next


---

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
http://public.kitware.com/mailman/listinfo/cmake-commits

Re: [cmake-developers] Generating buildsystem metadata from CMake

2015-10-13 Thread Stephen Kelly 
Alexander Neundorf wrote:

> Maybe this is of interest: the Eclipse CDT developers are currently
> working on improved support for cmake:
> https://bugs.eclipse.org/bugs/show_bug.cgi?id=350206
> http://dev.eclipse.org/mhonarc/lists/cdt-dev/msg29621.html

Yes, I noticed that too a few days ago.

My work should make reading the CMakeLists.txt file not necessary, as they 
seem to intend to do.

I'll ping them when I have something to show.

Thanks,

Steve.


-- 

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:
http://public.kitware.com/mailman/listinfo/cmake-developers

[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-523-g6638bfe

2015-10-13 Thread Stephen Kelly 
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, next has been updated
   via  6638bfeba68c732f5441e00fdcd807957d3b041a (commit)
   via  fd7dfcae57604216c18d60efffcd243b5506f5a6 (commit)
  from  da7ed9b1e766d6cb8e657c1420c07eabd726a34a (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=6638bfeba68c732f5441e00fdcd807957d3b041a
commit 6638bfeba68c732f5441e00fdcd807957d3b041a
Merge: da7ed9b fd7dfca
Author: Stephen Kelly 
AuthorDate: Tue Oct 13 15:31:05 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Oct 13 15:31:05 2015 -0400

Merge topic 'genex-generator-objects' into next

fd7dfcae fixup! cmMakefile: Store container of cmExportBuildFileGenerators.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fd7dfcae57604216c18d60efffcd243b5506f5a6
commit fd7dfcae57604216c18d60efffcd243b5506f5a6
Author: Stephen Kelly 
AuthorDate: Tue Oct 13 21:30:40 2015 +0200
Commit: Stephen Kelly 
CommitDate: Tue Oct 13 21:30:40 2015 +0200

fixup! cmMakefile: Store container of cmExportBuildFileGenerators.

diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 432b57c..fc81708 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -362,7 +362,8 @@ public:
   cmFileLockPool& GetFileLockPool() { return FileLockPool; }
 #endif
 
-  bool GetConfigureDoneCMP0026() const { return 
this->ConfigureDoneCMP0026AndCMP0024; }
+  bool GetConfigureDoneCMP0026() const
+  { return this->ConfigureDoneCMP0026AndCMP0024; }
 
   void ComputeBuildFileGenerators();
 

---

Summary of changes:
 Source/cmGlobalGenerator.h |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-521-gda7ed9b

2015-10-13 Thread Stephen Kelly 
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, next has been updated
   via  da7ed9b1e766d6cb8e657c1420c07eabd726a34a (commit)
   via  398edc10b5b2c73876bb4a409cff2ef43ecb8239 (commit)
   via  6219fc87aedb59e99f116b8c92f670f1ab3f60a4 (commit)
  from  0013c5cad94e4e3c61a4f3eceafeb382bdc36969 (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=da7ed9b1e766d6cb8e657c1420c07eabd726a34a
commit da7ed9b1e766d6cb8e657c1420c07eabd726a34a
Merge: 0013c5c 398edc1
Author: Stephen Kelly 
AuthorDate: Tue Oct 13 15:00:19 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Oct 13 15:00:19 2015 -0400

Merge topic 'genex-generator-objects' into next

398edc10 cmLocalGenerator: Store cmGeneratorTargets.
6219fc87 cmMakefile: Store container of cmExportBuildFileGenerators.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=398edc10b5b2c73876bb4a409cff2ef43ecb8239
commit 398edc10b5b2c73876bb4a409cff2ef43ecb8239
Author: Stephen Kelly 
AuthorDate: Wed Sep 16 05:21:07 2015 +0200
Commit: Stephen Kelly 
CommitDate: Tue Oct 13 20:59:50 2015 +0200

cmLocalGenerator: Store cmGeneratorTargets.

Relieve cmMakefile of this responsibility.

diff --git a/Source/cmCustomCommandGenerator.cxx 
b/Source/cmCustomCommandGenerator.cxx
index 7f02afe..618f09f 100644
--- a/Source/cmCustomCommandGenerator.cxx
+++ b/Source/cmCustomCommandGenerator.cxx
@@ -43,7 +43,7 @@ std::string cmCustomCommandGenerator::GetCommand(unsigned int 
c) const
 {
   std::string const& argv0 = this->CC.GetCommandLines()[c][0];
   cmGeneratorTarget* target =
-  this->LG->GetMakefile()->FindGeneratorTargetToUse(argv0);
+  this->LG->FindGeneratorTargetToUse(argv0);
   if(target && target->GetType() == cmTarget::EXECUTABLE &&
  (target->Target->IsImported()
   || !this->LG->GetMakefile()->IsOn("CMAKE_CROSSCOMPILING")))
diff --git a/Source/cmExportBuildFileGenerator.cxx 
b/Source/cmExportBuildFileGenerator.cxx
index 560cfc5..6c3cccd 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -42,7 +42,7 @@ bool 
cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
 tei = targets.begin();
   tei != targets.end(); ++tei)
 {
-cmGeneratorTarget *te = this->LG->GetMakefile()
+cmGeneratorTarget *te = this->LG
 ->FindGeneratorTargetToUse(*tei);
 expectedTargets += sep + this->Namespace + te->Target->GetExportName();
 sep = " ";
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx 
b/Source/cmExtraEclipseCDT4Generator.cxx
index fdfa35e..b7aeb02 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -965,8 +965,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
it != this->GlobalGenerator->GetLocalGenerators().end();
++it)
 {
-cmGeneratorTargetsType targets = (*it)->GetMakefile()
-->GetGeneratorTargets();
+cmGeneratorTargetsType targets = (*it)->GetGeneratorTargets();
 for (cmGeneratorTargetsType::iterator l = targets.begin();
  l != targets.end(); ++l)
   {
diff --git a/Source/cmGeneratorExpressionNode.cxx 
b/Source/cmGeneratorExpressionNode.cxx
index 2797d10..fe83b08 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -1275,7 +1275,7 @@ static const struct TargetObjectsNode : public 
cmGeneratorExpressionNode
 
 std::string tgtName = parameters.front();
 cmGeneratorTarget* gt =
-context->LG->GetMakefile()->FindGeneratorTargetToUse(tgtName);
+context->LG->FindGeneratorTargetToUse(tgtName);
 if (!gt)
   {
   std::ostringstream e;
@@ -1739,7 +1739,7 @@ struct TargetFilesystemArtifact : public 
cmGeneratorExpressionNode
   return std::string();
   }
 cmGeneratorTarget* target =
-context->LG->GetMakefile()->FindGeneratorTargetToUse(name);
+context->LG->FindGeneratorTargetToUse(name);
 if(!target)
   {
   ::reportError(context, content->GetOriginalExpression(),
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 6033efe..6bebc2b 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -2305,7 +2305,8 @@ bool cmTargetTraceDependencies::IsUtility(std::string 
const& dep)
 
   // Check for a target with this name.
   if(cmGeneratorTarget* t
-= this->Makefile->FindGeneratorTargetToUse(util))
+=

Re: [CMake] C++11 flag not being added

2015-10-13 Thread Matthew S Wallace 
Thanks, setting the global variable solved my issue.

-Matt

> On Oct 13, 2015, at 10:46 AM, Johannes Zarl-Zierl 
>  wrote:
> 
> Hi,
> 
> CXX_STANDARD is a target property, not a global one. You can either set 
> CXX_STANDARD for every target that needs it, or set it globally by changing 
> the default value.
> 
> You can do the latter by setting the variable CMAKE_CXX_STANDARD  before 
> defining any target that depends on it:
> 
> set(CMAKE_CXX_STANDARD 11)
> 
> HTH,
>  Johannes
> 
> On Tuesday 13 October 2015 10:22:36 Matthew S Wallace wrote:
>> I have the following two lines in my CMakeLists.txt
>> 
>> set_property(GLOBAL PROPERTY CXX_STANDARD 11)
>> set_property(GLOBAL PROPERTY CXX_STANDARD_REQUIRED)
>> 
>> However when compiling some of my source files, the -std=c++11 flag is not
>> added.
>> 
>> Just for good measure I added:
>> target_compile_features(my_target PRIVATE cxx_strong_enums) to the target
>> that was having the problem.
>> 
>> Not sure if it matters, but in this case the compile error I’m getting is
>> complaining because I’m referencing a fully scoped enum.  If I explicitly
>> include -std=c++11 in my compile flags, everything works.
>> 
>> I’m thinking I’m probably just misunderstanding how CXX_STANDARD works, but
>> any help would be appreciated.
>> 
>> -Matt
> 
> -- 
> 
> 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:
> http://public.kitware.com/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:
http://public.kitware.com/mailman/listinfo/cmake

Re: [cmake-developers] genex-generator-objects topic

2015-10-13 Thread Stephen Kelly 
Brad King wrote:

> Steve,
> 
> Last night's RunCMake.include test failures bisect to:
> 
>  cmMakefile: Store container of cmExportBuildFileGenerators.
>  https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5925f99c
> 
> A clang sanitizer build output is below.  Please take a look.

Looks like unique_ptrs would really help.

I've fixed it up I think.

Thanks,

Steve.


-- 

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:
http://public.kitware.com/mailman/listinfo/cmake-developers

[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-518-g0013c5c

2015-10-13 Thread Stephen Kelly 
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, next has been updated
   via  0013c5cad94e4e3c61a4f3eceafeb382bdc36969 (commit)
   via  10d662d477f63604e2370c84c5d47f565d519433 (commit)
  from  2ee565e6f2795a90b7a4821cda7cbf23070efa5a (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=0013c5cad94e4e3c61a4f3eceafeb382bdc36969
commit 0013c5cad94e4e3c61a4f3eceafeb382bdc36969
Merge: 2ee565e 10d662d
Author: Stephen Kelly 
AuthorDate: Tue Oct 13 14:58:12 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Oct 13 14:58:12 2015 -0400

Merge topic 'genex-generator-objects' into next

10d662d4 fixup! cmMakefile: Store container of cmExportBuildFileGenerators.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=10d662d477f63604e2370c84c5d47f565d519433
commit 10d662d477f63604e2370c84c5d47f565d519433
Author: Stephen Kelly 
AuthorDate: Tue Oct 13 20:57:21 2015 +0200
Commit: Stephen Kelly 
CommitDate: Tue Oct 13 20:57:30 2015 +0200

fixup! cmMakefile: Store container of cmExportBuildFileGenerators.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 8f5e84a..e8be2d6 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -73,7 +73,7 @@ cmGlobalGenerator::cmGlobalGenerator(cmake* cm)
   this->CurrentMakefile = 0;
   this->TryCompileOuterMakefile = 0;
 
-  this->ConfigureDoneCMP0026 = false;
+  this->ConfigureDoneCMP0026AndCMP0024 = false;
 }
 
 cmGlobalGenerator::~cmGlobalGenerator()
@@ -234,6 +234,16 @@ bool cmGlobalGenerator::GenerateImportFile(const 
std::string )
   if (it != this->BuildExportSets.end())
 {
 bool result = it->second->GenerateImportFile();
+
+if (!this->ConfigureDoneCMP0026AndCMP0024)
+  {
+  for (std::vector::const_iterator mit =
+   this->Makefiles.begin(); mit != this->Makefiles.end(); ++mit)
+{
+(*mit)->RemoveExportBuildFileGeneratorCMP0024(it->second);
+}
+  }
+
 delete it->second;
 it->second = 0;
 this->BuildExportSets.erase(it);
@@ -1122,11 +1132,11 @@ void cmGlobalGenerator::Configure()
   this->CMakeInstance->GetHomeOutputDirectory());
 
   // now do it
-  this->ConfigureDoneCMP0026 = false;
+  this->ConfigureDoneCMP0026AndCMP0024 = false;
   dirMf->Configure();
   dirMf->EnforceDirectoryLevelRules();
 
-  this->ConfigureDoneCMP0026 = true;
+  this->ConfigureDoneCMP0026AndCMP0024 = true;
 
   // Put a copy of each global target in every directory.
   cmTargets globalTargets;
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 294fca9..432b57c 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -362,7 +362,7 @@ public:
   cmFileLockPool& GetFileLockPool() { return FileLockPool; }
 #endif
 
-  bool GetConfigureDoneCMP0026() const { return this->ConfigureDoneCMP0026; }
+  bool GetConfigureDoneCMP0026() const { return 
this->ConfigureDoneCMP0026AndCMP0024; }
 
   void ComputeBuildFileGenerators();
 
@@ -522,7 +522,7 @@ protected:
   bool ForceUnixPaths;
   bool ToolSupportsColor;
   bool InstallTargetEnabled;
-  bool ConfigureDoneCMP0026;
+  bool ConfigureDoneCMP0026AndCMP0024;
 };
 
 #endif
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 61832ba..8ac6358 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -708,6 +708,18 @@ cmMakefile::GetExportBuildFileGenerators() const
   return this->ExportBuildFileGenerators;
 }
 
+void cmMakefile::RemoveExportBuildFileGeneratorCMP0024(
+cmExportBuildFileGenerator* gen)
+{
+  std::vector::iterator it =
+  std::find(this->ExportBuildFileGenerators.begin(),
+this->ExportBuildFileGenerators.end(), gen);
+  if(it != this->ExportBuildFileGenerators.end())
+{
+this->ExportBuildFileGenerators.erase(it);
+}
+}
+
 void cmMakefile::AddExportBuildFileGenerator(cmExportBuildFileGenerator* gen)
 {
   this->ExportBuildFileGenerators.push_back(gen);
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 8f865a0..8fe0bda 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -779,6 +779,7 @@ public:
 
   std::vector
   GetExportBuildFileGenerators() const;
+  void RemoveExportBuildFileGeneratorCMP0024(cmExportBuildFileGenerator* gen);
   void AddExportBuildFileGenerator(cmExportBuildFileGenerator* gen);
 
 protected:

---

Summary of changes:
 Source/cmGlobalGenerator.cxx |   16 +---

[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-525-ge15afa2

2015-10-13 Thread Stephen Kelly 
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, next has been updated
   via  e15afa23efdaa409f5f809444fa1ceb98f18210b (commit)
   via  1d4979a5cd69a115c91d04a343925d2860b92c1e (commit)
  from  6638bfeba68c732f5441e00fdcd807957d3b041a (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=e15afa23efdaa409f5f809444fa1ceb98f18210b
commit e15afa23efdaa409f5f809444fa1ceb98f18210b
Merge: 6638bfe 1d4979a
Author: Stephen Kelly 
AuthorDate: Tue Oct 13 18:37:17 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Oct 13 18:37:17 2015 -0400

Merge topic 'init-state-for-subdirs' into next

1d4979a5 Revert "Subdirs: Initialize from parent before configuring."


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1d4979a5cd69a115c91d04a343925d2860b92c1e
commit 1d4979a5cd69a115c91d04a343925d2860b92c1e
Author: Stephen Kelly 
AuthorDate: Wed Oct 14 00:36:34 2015 +0200
Commit: Stephen Kelly 
CommitDate: Wed Oct 14 00:36:34 2015 +0200

Revert "Subdirs: Initialize from parent before configuring."

This reverts commit 7dac31b2292b0eac32929649cad1f32e6f0a6114.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 3b8c188..73d3522 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1682,7 +1682,6 @@ void cmMakefile::Configure()
   std::vector::iterator sdi = subdirs.begin();
   for (; sdi != subdirs.end(); ++sdi)
 {
-(*sdi)->StateSnapshot.InitializeFromParent_ForSubdirsCommand();
 this->ConfigureSubDirectory(*sdi);
 }
 
diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index eb0145e..72c7330 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -1366,11 +1366,6 @@ std::string cmState::Snapshot::GetProjectName() const
   return this->Position->BuildSystemDirectory->ProjectName;
 }
 
-void cmState::Snapshot::InitializeFromParent_ForSubdirsCommand()
-{
-  this->InitializeFromParent();
-}
-
 cmState::Directory::Directory(
 cmLinkedTree::iterator iter,
 const cmState::Snapshot& snapshot)
diff --git a/Source/cmState.h b/Source/cmState.h
index 4f714a6..2f66f7f 100644
--- a/Source/cmState.h
+++ b/Source/cmState.h
@@ -90,8 +90,6 @@ public:
 void SetProjectName(std::string const& name);
 std::string GetProjectName() const;
 
-void InitializeFromParent_ForSubdirsCommand();
-
 struct StrictWeakOrder
 {
   bool operator()(const cmState::Snapshot& lhs,
diff --git a/Tests/SubDir/CMakeLists.txt b/Tests/SubDir/CMakeLists.txt
index 32aa93f..6822e6b 100644
--- a/Tests/SubDir/CMakeLists.txt
+++ b/Tests/SubDir/CMakeLists.txt
@@ -1,10 +1,6 @@
 cmake_minimum_required (VERSION 2.6)
 project(SUBDIR)
-
 subdirs(Executable EXCLUDE_FROM_ALL Examples)
-
-set(DEFINED_AFTER_SUBDIRS_COMMAND 42)
-
 write_file(${SUBDIR_BINARY_DIR}/ShouldBeHere "This file should exist.")
 #WATCOM WMAKE does not support + in the name of a file!
 if(WATCOM)
diff --git a/Tests/SubDir/Executable/CMakeLists.txt 
b/Tests/SubDir/Executable/CMakeLists.txt
index e1e5ef3..77e6751 100644
--- a/Tests/SubDir/Executable/CMakeLists.txt
+++ b/Tests/SubDir/Executable/CMakeLists.txt
@@ -1,5 +1 @@
 add_executable(test test.cxx)
-
-if (NOT DEFINED_AFTER_SUBDIRS_COMMAND)
-  message(FATAL_ERROR "DEFINED_AFTER_SUBDIRS_COMMAND should be defined.")
-endif()

---

Summary of changes:
 Source/cmMakefile.cxx  |1 -
 Source/cmState.cxx |5 -
 Source/cmState.h   |2 --
 Tests/SubDir/CMakeLists.txt|4 
 Tests/SubDir/Executable/CMakeLists.txt |4 
 5 files changed, 16 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

Re: [cmake-developers] ITK NIfTI broken Oct 6

2015-10-13 Thread Stephen Kelly 
Brad King wrote:

> Therefore we see that CMAKE_CURRENT_SOURCE_DIR is incorrectly set.
> This CMakeLists.txt file is again entered by the subdirs() command
> in the parent directory.

What a mess...

Thanks for bisecting. I fixed this by pushing part of a branch which I was 
intending to start to merge soon anyway.

Thanks,

Steve.


-- 

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:
http://public.kitware.com/mailman/listinfo/cmake-developers

[CMake] cmake_check_build_system is causing a rebuild at "make install"

2015-10-13 Thread John Cary 
For future reference, one can determine what triggered the reconfigure 
by doing


  make install VERBOSE=1

It appears not to be enough to have configured with
-DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE.

In our case, for reasons we have not yet figured out, the depend
file for a particular .cu.o object built for a test was what was newer
and causing the rebuild. For so-far not understood reasons, this
.depend file is being touched during the build.

.JR


On 10/13/2015 8:51 AM, cmake-requ...@cmake.org wrote:

Date: Mon, 12 Oct 2015 17:41:51 -0600
From: JR Cary 
To: cmake@cmake.org
Subject: [CMake] cmake_check_build_system is causing a rebuild at
"make  install"
Message-ID: <561c453f.1070...@txcorp.com>

In our use of cmake on a particular project, we noticed that
after building the project, upon invoking "make install", the
build starts all over again.  Hence we are building the project
twice.

It seems that this is occurring because nearly everything depends
on the target, cmake_check_build_system, which sometimes causes a
reconfiguration, i.e. reinvocation of cmake.  In particular, the
generated Makefile's have:

install: preinstall
...
preinstall: all
...
all: cmake_check_build_system

and then the last target invokes

/cmake -H -B  --check-build-system
CMakeFiles/Makefile.cmake 0

Sometimes this causes a reconfiguration of our project and
sometimes not.  When it does, the whole project rebuilds because
nearly everything depends on some configure_file generated
config.h files.

How can we tell why this reconfiguring?

BTW, I could not find any of the options, -B, -H, or
--check-build-system at the documentation,
https://cmake.org/cmake/help/v3.3/manual/cmake.1.html.



--

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:
http://public.kitware.com/mailman/listinfo/cmake

[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-533-gd2d09ae

2015-10-13 Thread Stephen Kelly 
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, next has been updated
   via  d2d09aece23f023f3e81586811a31abac0e3292f (commit)
   via  2bf7de167f0b72b07c6246679c964d83cdc47d45 (commit)
   via  0aa34de5493732d219dd3f58634222677bd19e22 (commit)
   via  20b95ef8c83fbcb7705e72c85c9de18ff420562f (commit)
   via  841164cb36650574a1a7363c78e4cdf28d5d37fd (commit)
   via  2c219bafc045dfdf49529b8ad141fed3dbb4d8e9 (commit)
   via  84e0776e77e625ab43c1a5b2031a06a035ae0210 (commit)
   via  871ab98dad2ed9d504a081a0ffa62b438793cbe4 (commit)
  from  e15afa23efdaa409f5f809444fa1ceb98f18210b (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=d2d09aece23f023f3e81586811a31abac0e3292f
commit d2d09aece23f023f3e81586811a31abac0e3292f
Merge: e15afa2 2bf7de1
Author: Stephen Kelly 
AuthorDate: Tue Oct 13 18:38:32 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Oct 13 18:38:32 2015 -0400

Merge topic 'refactor-state-initialization' into next

2bf7de16 Subdirs: Initialize from parent before configuring.
0aa34de5 cmState: Initialize properties immediately.
20b95ef8 cmState: Initialize default definitions immediately.
841164cb cmState: Initialize current directories immediately.
2c219baf cmState: Initialize top level source directories immediately.
84e0776e cmMakefile: Set default internal definitions directly.
871ab98d cmMakefile: Set internal definitions directly.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2bf7de167f0b72b07c6246679c964d83cdc47d45
commit 2bf7de167f0b72b07c6246679c964d83cdc47d45
Author: Stephen Kelly 
AuthorDate: Mon Oct 12 19:34:06 2015 +0200
Commit: Stephen Kelly 
CommitDate: Wed Oct 14 00:34:11 2015 +0200

Subdirs: Initialize from parent before configuring.

Add new API for the subdirs command to cmState.

This fixes a regression introduced in commit f716460e (cmMakefile: Move
invokation to initialize snapshot., 2015-10-06).

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 3f94125..ce95b2c 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1647,6 +1647,7 @@ void cmMakefile::Configure()
   std::vector::iterator sdi = subdirs.begin();
   for (; sdi != subdirs.end(); ++sdi)
 {
+(*sdi)->StateSnapshot.InitializeFromParent_ForSubdirsCommand();
 this->ConfigureSubDirectory(*sdi);
 }
 
diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index 01fd4e2..825204c 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -1447,6 +1447,20 @@ std::string cmState::Snapshot::GetProjectName() const
   return this->Position->BuildSystemDirectory->ProjectName;
 }
 
+void cmState::Snapshot::InitializeFromParent_ForSubdirsCommand()
+{
+  std::string currentSrcDir = this->GetDefinition("CMAKE_CURRENT_SOURCE_DIR");
+  std::string currentBinDir = this->GetDefinition("CMAKE_CURRENT_BINARY_DIR");
+  this->InitializeFromParent();
+  this->SetDefinition("CMAKE_SOURCE_DIR",
+  this->State->GetSourceDirectory());
+  this->SetDefinition("CMAKE_BINARY_DIR",
+  this->State->GetBinaryDirectory());
+
+  this->SetDefinition("CMAKE_CURRENT_SOURCE_DIR", currentSrcDir.c_str());
+  this->SetDefinition("CMAKE_CURRENT_BINARY_DIR", currentBinDir.c_str());
+}
+
 cmState::Directory::Directory(
 cmLinkedTree::iterator iter,
 const cmState::Snapshot& snapshot)
diff --git a/Source/cmState.h b/Source/cmState.h
index 3e8a465..f2c0c6f 100644
--- a/Source/cmState.h
+++ b/Source/cmState.h
@@ -90,6 +90,8 @@ public:
 void SetProjectName(std::string const& name);
 std::string GetProjectName() const;
 
+void InitializeFromParent_ForSubdirsCommand();
+
 struct StrictWeakOrder
 {
   bool operator()(const cmState::Snapshot& lhs,
diff --git a/Tests/SubDir/CMakeLists.txt b/Tests/SubDir/CMakeLists.txt
index 6822e6b..32aa93f 100644
--- a/Tests/SubDir/CMakeLists.txt
+++ b/Tests/SubDir/CMakeLists.txt
@@ -1,6 +1,10 @@
 cmake_minimum_required (VERSION 2.6)
 project(SUBDIR)
+
 subdirs(Executable EXCLUDE_FROM_ALL Examples)
+
+set(DEFINED_AFTER_SUBDIRS_COMMAND 42)
+
 write_file(${SUBDIR_BINARY_DIR}/ShouldBeHere "This file should exist.")
 #WATCOM WMAKE does not support + in the name of a file!
 if(WATCOM)
diff --git a/Tests/SubDir/Executable/CMakeLists.txt 
b/Tests/SubDir/Executable/CMakeLists.txt
index 77e6751..fbe338e 100644
--- a/Tests/SubDir/Executable/CMakeLists.txt
+++ b/Tests/SubDir/Executable/CMakeLists.txt
@@ -1 +1,13 @@
 add_executable(test test.cxx)
+
+if (NOT