[Cmake-commits] CMake branch, master, updated. v3.7.0-rc2-347-g9d203c0

2016-10-25 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  9d203c0051bbec48dfbee90940e6faff87a2bdeb (commit)
  from  2a567c68ce6605071f3e21638560493b71ed2841 (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=9d203c0051bbec48dfbee90940e6faff87a2bdeb
commit 9d203c0051bbec48dfbee90940e6faff87a2bdeb
Author: Kitware Robot <kwro...@kitware.com>
AuthorDate: Wed Oct 26 00:01:03 2016 -0400
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Oct 26 00:01:03 2016 -0400

CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index c656fba..ea6bdad 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 7)
-set(CMake_VERSION_PATCH 20161025)
+set(CMake_VERSION_PATCH 20161026)
 #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] clean custom_target

2016-10-25 Thread Tiago Macarios
Hi,

Is there a way to have a command to be run during a clean?

I have a custom_target which does a fair bit of things and it also has the
ability to clean up after itself. So conceptually something like this is
what I am looking for:

add_custom_target(Name ALL
COMMAND command
COMMAND_CLEAN command -clean
)


Tiago
-- 

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] make install gives cmake link errors for libstdc++

2016-10-25 Thread Jack Stalnaker
I'm having an odd problem. I built and installed cmake in a non-standard
location, using a compiler different from the system compiler on linux.
Cmake compiles without complaint, and installs without complaint. When I
attempt to build a piece of software using cmake, the configuration and
build stages are fine. However, when I run 'make install', I get errors
similar to:

/my/version/cmake: /usr/lib64/libstdc++.so.6: version 'GLIBCXX_3.4.20' not
found (required by cmake)

The funny thing is, though /my/version/cmake is not linked to
/usr/lib64/libstdc++.so.6. Instead, it's linked to
/my/version/libstdc++.so.6, as I intended. I've verified this with ldd,
which only shows the latter expected results. /my/version/libstdc++.so.6 is
in the library path, too, Not sure what's going on. Can someone help?

--Jack
-- 

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] CPack DEB version info is missing patch level

2016-10-25 Thread cen
Sorry for wasting your time, it does work indeed. I forgot to pull the 
correct version of CmakeLists.txt on my debian machine..


Thank you.


Domen Vrankar je 25. 10. 2016 ob 21:48 napisal:
2016-10-25 16:59 GMT+02:00 cen >:



Why is patch level not baked into the DEB but it is in RPM? If
install the deb, soft links have the proper patch level version so
I guess it is ultimately ok but kinda annoying.


Which version of CPack are you using?

I can't reproduce this even with old CMake version 3.0.2 and minimal 
CMakeLists.txt:


#--

cmake_minimum_required(VERSION 3.0)
project(test)

install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
DESTINATION dest)

set(CPACK_PACKAGE_VERSION_MAJOR 1)
set(CPACK_PACKAGE_VERSION_MINOR 2)
set(CPACK_PACKAGE_VERSION_PATCH 3)
set(CPACK_PACKAGE_CONTACT "Test >")

include(CPack)

#--

cmake -D CPACK_BINARY_DEB:bool=ON ..
make package
dpkg-deb -I test-1.2.3-Linux.deb

result: Version: 1.2.3


Regards,
Domen


-- 

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 - ified libjpeg source code

2016-10-25 Thread Boudewijn Rempt
On Tue, 25 Oct 2016, Aaron Boxer wrote:

> Hello,
> 
> I am looking for a cmake-ified jpeg library to add to another cmake project.
> Any recommendations?

I get mine here:

https://phabricator.kde.org/diffusion/EMERGE/browse/master/portage/win32libs/jpeg/

-- 
Boudewijn Rempt | http://www.krita.org, http://www.valdyas.org
-- 

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] CPack DEB version info is missing patch level

2016-10-25 Thread Domen Vrankar
2016-10-25 16:59 GMT+02:00 cen :

>
> Why is patch level not baked into the DEB but it is in RPM? If install the
> deb, soft links have the proper patch level version so I guess it is
> ultimately ok but kinda annoying.
>

Which version of CPack are you using?

I can't reproduce this even with old CMake version 3.0.2 and minimal
CMakeLists.txt:

#--

cmake_minimum_required(VERSION 3.0)
project(test)

install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
DESTINATION dest)

set(CPACK_PACKAGE_VERSION_MAJOR 1)
set(CPACK_PACKAGE_VERSION_MINOR 2)
set(CPACK_PACKAGE_VERSION_PATCH 3)
set(CPACK_PACKAGE_CONTACT "Test ")

include(CPack)

#--

cmake -D CPACK_BINARY_DEB:bool=ON ..
make package
dpkg-deb -I test-1.2.3-Linux.deb

result: Version: 1.2.3


Regards,
Domen
-- 

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.7.0-rc2-759-g5521217

2016-10-25 Thread Daniel Pfeifer
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  5521217d66f57464ac4ecf715527682f5148f356 (commit)
   via  c98c12731a987cf83d7aabc3b8127c51ceb8d741 (commit)
  from  331a9929897ad4ba864320e12bee96db86ffd8fe (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=5521217d66f57464ac4ecf715527682f5148f356
commit 5521217d66f57464ac4ecf715527682f5148f356
Merge: 331a992 c98c127
Author: Daniel Pfeifer 
AuthorDate: Tue Oct 25 15:39:03 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Oct 25 15:39:03 2016 -0400

Merge topic 'include-what-you-use' into next

c98c1273 Include necessary headers in commands


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c98c12731a987cf83d7aabc3b8127c51ceb8d741
commit c98c12731a987cf83d7aabc3b8127c51ceb8d741
Author: Daniel Pfeifer 
AuthorDate: Tue Oct 25 20:35:04 2016 +0200
Commit: Daniel Pfeifer 
CommitDate: Tue Oct 25 21:22:36 2016 +0200

Include necessary headers in commands

diff --git a/Source/cmAddCustomCommandCommand.cxx 
b/Source/cmAddCustomCommandCommand.cxx
index 1ab4ef6..620de31 100644
--- a/Source/cmAddCustomCommandCommand.cxx
+++ b/Source/cmAddCustomCommandCommand.cxx
@@ -2,11 +2,19 @@
file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmAddCustomCommandCommand.h"
 
-#include "cmTarget.h"
+#include 
 
+#include "cmCustomCommand.h"
+#include "cmCustomCommandLines.h"
+#include "cmGlobalGenerator.h"
+#include "cmMakefile.h"
+#include "cmPolicies.h"
 #include "cmSourceFile.h"
+#include "cmSystemTools.h"
+#include "cmTarget.h"
+#include "cmake.h"
 
-#include "cmGlobalGenerator.h"
+class cmExecutionStatus;
 
 // cmAddCustomCommandCommand
 bool cmAddCustomCommandCommand::InitialPass(
diff --git a/Source/cmAddCustomCommandCommand.h 
b/Source/cmAddCustomCommandCommand.h
index 643163c..ea92163 100644
--- a/Source/cmAddCustomCommandCommand.h
+++ b/Source/cmAddCustomCommandCommand.h
@@ -3,8 +3,14 @@
 #ifndef cmAddCustomCommandCommand_h
 #define cmAddCustomCommandCommand_h
 
+#include 
+#include 
+#include 
+
 #include "cmCommand.h"
 
+class cmExecutionStatus;
+
 /** \class cmAddCustomCommandCommand
  * \brief cmAddCustomCommandCommand defines a new command (rule) that can
  *  be executed within the build process
diff --git a/Source/cmAddCustomTargetCommand.cxx 
b/Source/cmAddCustomTargetCommand.cxx
index 9c41dac..4e656aa 100644
--- a/Source/cmAddCustomTargetCommand.cxx
+++ b/Source/cmAddCustomTargetCommand.cxx
@@ -2,8 +2,18 @@
file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmAddCustomTargetCommand.h"
 
+#include 
+
+#include "cmCustomCommandLines.h"
 #include "cmGeneratorExpression.h"
 #include "cmGlobalGenerator.h"
+#include "cmMakefile.h"
+#include "cmPolicies.h"
+#include "cmSystemTools.h"
+#include "cmTarget.h"
+#include "cmake.h"
+
+class cmExecutionStatus;
 
 // cmAddCustomTargetCommand
 bool cmAddCustomTargetCommand::InitialPass(
diff --git a/Source/cmAddCustomTargetCommand.h 
b/Source/cmAddCustomTargetCommand.h
index 2ad244c..b679247 100644
--- a/Source/cmAddCustomTargetCommand.h
+++ b/Source/cmAddCustomTargetCommand.h
@@ -3,8 +3,14 @@
 #ifndef cmAddCustomTargetCommand_h
 #define cmAddCustomTargetCommand_h
 
+#include 
+#include 
+#include 
+
 #include "cmCommand.h"
 
+class cmExecutionStatus;
+
 /** \class cmAddCustomTargetCommand
  * \brief Command that adds a target to the build system.
  *
diff --git a/Source/cmAddDefinitionsCommand.cxx 
b/Source/cmAddDefinitionsCommand.cxx
index 8d82e71..9e0607c 100644
--- a/Source/cmAddDefinitionsCommand.cxx
+++ b/Source/cmAddDefinitionsCommand.cxx
@@ -2,6 +2,10 @@
file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmAddDefinitionsCommand.h"
 
+#include "cmMakefile.h"
+
+class cmExecutionStatus;
+
 // cmAddDefinitionsCommand
 bool cmAddDefinitionsCommand::InitialPass(std::vector const& args,
   cmExecutionStatus&)
diff --git a/Source/cmAddDefinitionsCommand.h b/Source/cmAddDefinitionsCommand.h
index c6b5699..735f8cc 100644
--- a/Source/cmAddDefinitionsCommand.h
+++ b/Source/cmAddDefinitionsCommand.h
@@ -3,8 +3,14 @@
 #ifndef cmAddDefinitionsCommand_h
 #define cmAddDefinitionsCommand_h
 
+#include 
+#include 
+#include 
+
 #include "cmCommand.h"
 
+class cmExecutionStatus;
+
 /** \class cmAddDefinitionsCommand
  * \brief Specify a list of compiler defines
  *
diff --git a/Source/cmAddDependenciesCommand.cxx 
b/Source/cmAddDependenciesCommand.cxx
index 0fa8943..e49d5d5 

[CMake] cmake - ified libjpeg source code

2016-10-25 Thread Aaron Boxer
Hello,

I am looking for a cmake-ified jpeg library to add to another cmake project.
Any recommendations?

Thanks,
Aaron
-- 

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] ExternalProject_Add : set the location of CMakeLists.txt

2016-10-25 Thread Konstantin Podsvirov
Hello again.

25.10.2016, 20:31, "Konstantin Podsvirov" :
> Hello, Benjamin.
>
> 25.10.2016, 19:41, "Benjamin Ballet via CMake" :
>>  Hi,
>>
>>  I'm trying to get GLEW (https://github.com/nigels-com/glew) with 
>> ExternalProject_Add
>>  It's buildable with cmake but the CMakeLists.txt is in build/cmake 
>> directory.
>>
>>  Is there a way to specify the directory of the CMakeLists.txt file ?
>>
>>  If I change SOURCE_DIR it will only clone the repo in SOURCE_DIR and still 
>> run the cmake command in repo root.
>>
>>  --
>>  Benjamin BALLET
>>  Ingénieur R
>>
>>  ACTIVISU
>>  19, rue Klock - 92110 Clichy
>>>  Standard Tél :  01 44 69 37 37
>>>  www.activisu.com
>>  ,--
>
> Try it:
>
> ExternalProject_Add(
>   ...
>   SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/source
>   ...
>   CONFIGURE_COMMAND ${CMAKE_COMMAND} [additional args...] 
> ${CMAKE_CURRENT_BINARY_DIR}/source/build/cmake
>   ...)


Or try it:

ExternalProject_Add(
  ...
  SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/source
  ...
  CONFIGURE_COMMAND ${CMAKE_COMMAND} [additional args...]
   -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
   -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
   -DCMAKE_GENERATOR_TOOLSET=${CMAKE_GENERATOR_TOOLSET}
${CMAKE_CURRENT_BINARY_DIR}/source/build/cmake
  ...)

--
Regards,
Konstantin Podsvirov
-- 

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.7.0-rc2-757-g331a992

2016-10-25 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  331a9929897ad4ba864320e12bee96db86ffd8fe (commit)
   via  68e7250a9facbe7b82cff17af3bf2a831e481f3c (commit)
  from  24e5bff0eb7e82d34775a029296858b8142ff02f (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=331a9929897ad4ba864320e12bee96db86ffd8fe
commit 331a9929897ad4ba864320e12bee96db86ffd8fe
Merge: 24e5bff 68e7250
Author: Brad King 
AuthorDate: Tue Oct 25 13:43:41 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Oct 25 13:43:41 2016 -0400

Merge topic 'fix-right-angle-bracket-feature-test' into next

68e7250a Features: Fix cxx_right_angle_brackets compiler feature test


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=68e7250a9facbe7b82cff17af3bf2a831e481f3c
commit 68e7250a9facbe7b82cff17af3bf2a831e481f3c
Author: Alex Wang 
AuthorDate: Tue Oct 25 13:30:42 2016 -0400
Commit: Brad King 
CommitDate: Tue Oct 25 13:38:12 2016 -0400

Features: Fix cxx_right_angle_brackets compiler feature test

The clang-format pass in commit v3.6.0-rc1~54^2~1 (Revise C++ coding
style using clang-format, 2016-05-16) changed the template right angle
brackets from `>>` to `> >`, which defeats the purpose of this test.
Change it back and exclude this content from formatting.

diff --git a/Tests/CompileFeatures/cxx_right_angle_brackets.cpp 
b/Tests/CompileFeatures/cxx_right_angle_brackets.cpp
index 8f1b0ee..4d494b5 100644
--- a/Tests/CompileFeatures/cxx_right_angle_brackets.cpp
+++ b/Tests/CompileFeatures/cxx_right_angle_brackets.cpp
@@ -7,6 +7,8 @@ struct A
 
 void someFunc()
 {
-  A object;
+  /* clang-format off */
+  A object;
+  /* clang-format on */
   (void)object;
 }
diff --git a/Utilities/Scripts/clang-format.bash 
b/Utilities/Scripts/clang-format.bash
index a7080fc..ad3b3a1 100755
--- a/Utilities/Scripts/clang-format.bash
+++ b/Utilities/Scripts/clang-format.bash
@@ -130,6 +130,7 @@ $git_ls -z -- '*.c' '*.cc' '*.cpp' '*.cxx' '*.h' '*.hh' 
'*.hpp' '*.hxx' |
 
   # Exclude manually-formatted sources (e.g. with long lines).
   egrep -z -v '^Tests/PositionIndependentTargets/pic_test.h' |
+  egrep -z -v '^Tests/CompileFeatures/cxx_right_angle_brackets.cpp' |
 
   # Exclude sources with encoding not suported by clang-format.
   egrep -z -v '^Tests/RunCMake/CommandLine/cmake_depends/test_UTF-16LE.h' |

---

Summary of changes:
 Tests/CompileFeatures/cxx_right_angle_brackets.cpp |4 +++-
 Utilities/Scripts/clang-format.bash|1 +
 2 files changed, 4 insertions(+), 1 deletion(-)


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


Re: [CMake] ExternalProject_Add : set the location of CMakeLists.txt

2016-10-25 Thread Konstantin Podsvirov
Hello, Benjamin.

25.10.2016, 19:41, "Benjamin Ballet via CMake" :
> Hi,
>
> I'm trying to get GLEW (https://github.com/nigels-com/glew) with 
> ExternalProject_Add
> It's buildable with cmake but the CMakeLists.txt is in build/cmake directory.
>
> Is there a way to specify the directory of the CMakeLists.txt file ?
>
> If I change SOURCE_DIR it will only clone the repo in SOURCE_DIR and still 
> run the cmake command in repo root.
>
> --
> Benjamin BALLET
> Ingénieur R
>
> ACTIVISU
> 19, rue Klock - 92110 Clichy
>> Standard Tél :  01 44 69 37 37
>> www.activisu.com
> ,--

Try it:

ExternalProject_Add(
  ...
  SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/source
  ...
  CONFIGURE_COMMAND ${CMAKE_COMMAND} [additional args...] 
${CMAKE_CURRENT_BINARY_DIR}/source/build/cmake
  ...)

---
Regards,
Konstantin Podsvirov
-- 

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] ExternalProject_Add : set the location of CMakeLists.txt

2016-10-25 Thread Benjamin Ballet via CMake
Hi,

I'm trying to get GLEW (https://github.com/nigels-com/glew) with
ExternalProject_Add
It's buildable with cmake but the CMakeLists.txt is in build/cmake
directory.

Is there a way to specify the directory of the CMakeLists.txt file ?

If I change SOURCE_DIR it will only clone the repo in SOURCE_DIR and still
run the cmake command in repo root.

-- 
*Benjamin BALLET*
Ingénieur R

*ACTIVISU*
19, rue Klock - 92110 Clichy
*> Standard Tél* :  01 44 69 37 37
*>* www.activisu.com
-- 

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] [EXTERNAL]: FindProtobuf in specified dirs

2016-10-25 Thread Parag Chandra
I just pulled down the latest source, ran CMake on it, and then ran ccmake to 
view the options available. Mine shows several SPHINX-related options, and 
since SPHINX_EXECUTABLE could not be found, all the other SPHINX options have 
been set to OFF. Can you verify the same on your end? It seems to me that if no 
SPHINX output formats are enabled, then doc generation should be skipped.



Parag Chandra
Technical Lead, Mobile Team
Mobile: +1.919.824.1410

Ionic Security Inc.
1170 Peachtree St. NE STE 400, Atlanta, GA 30309




From: Homero Cardoso de Almeida 
Date: Tuesday, October 25, 2016 at 11:10 AM
To: Parag Chandra , "cmake@cmake.org" 
Subject: Re: [EXTERNAL]: [CMake] FindProtobuf in specified dirs

That did not work. Even though I set the BUILD_DOCUMENTATION flag in the 
debian/rules script, I cannot get it to skip doc build. Or maybe I'm writing in 
the wrong folder, I don't know. :(


Em ter, 25 de out de 2016 às 11:35, Parag Chandra 
> escreveu:
This is a shot in the dark, but if I remember correctly, building CMake 
requires a separate version of CMake in order to bootstrap itself. So when you 
run ccmake (or cmake-gui) to configure the new version of CMake you’re trying 
to build, there might be some Boolean option in there that will disable doc 
generation completely.



Parag Chandra
Technical Lead, Mobile Team
Mobile: +1.919.824.1410

Ionic Security Inc.
1170 Peachtree St. NE STE 400, Atlanta, GA 30309




From: Homero Cardoso de Almeida 
>
Date: Tuesday, October 25, 2016 at 9:28 AM

To: Parag Chandra >, 
"cmake@cmake.org" 
>
Subject: Re: [EXTERNAL]: [CMake] FindProtobuf in specified dirs

Actually, I'm trying to compile cmake 3.0.2 now.

I did exactly that for protobuffers, and it compiled file. It's just the 
package config file that still requires 2.8.12 and I'm not sure of the 
consequences of changing that. So I'm trying to build 3.0.2 on squeeze now, and 
having a hard time building the docs because of sphinx. If I could skip the 
docs, that would be fantastic.

Thanks,
Homero

Em ter, 25 de out de 2016 às 11:23, Parag Chandra 
> escreveu:
I actually haven’t ever tried to build protobuffers myself, so I can’t comment 
on its doc generation or sphinx dependency. Sorry if this seems obvious, but 
have you tried modifying protobuffer’s CMakeLists.txt file so that it uses the 
same 2.8.9 CMake you are using? 2.8.12 may not be that far off from 2.8.9; it 
just might be the version of CMake they happened to download at the time, 
rather than a hard requirement on it.



Parag Chandra
Technical Lead, Mobile Team
Mobile: +1.919.824.1410

Ionic Security Inc.
1170 Peachtree St. NE STE 400, Atlanta, GA 30309




From: Homero Cardoso de Almeida 
>
Date: Tuesday, October 25, 2016 at 8:06 AM
To: Parag Chandra >, 
"cmake@cmake.org" 
>
Subject: Re: [EXTERNAL]: [CMake] FindProtobuf in specified dirs

Thanks for your help.

I was able to download and compile protobuffers 2.7 using cmake, however the 
cmake config for protobuffers is fixed for 2.8.12, while I need it to work with 
cmake 2.8.9 as it's going to run in system frozen in Debian Squeeze (Squeeze 
actually defaults on cmake 2.8.2 and I got it to install 2.8.9 from Wheezy).

Currently I'm trying to create a debian package from cmake 3.0.2 on squeeze, 
but I'm having a hard time due to dependencies on sphinx. Do you have any ideas 
on how to circumvent the doc generation?

Thanks and regards,
Homero.

Em qui, 20 de out de 2016 às 17:05, Parag Chandra 
> escreveu:
I believe the protobuf-config.cmake.in 
generates a protobuf-config.cmake file once you actually use CMake to build 
protobuf itself.



Parag Chandra
Technical Lead, Mobile Team
Mobile: +1.919.824.1410

Ionic Security Inc.
1170 Peachtree St. NE STE 400, Atlanta, GA 30309




From: CMake > on behalf 
of Homero Cardoso de Almeida >
Date: Thursday, October 20, 2016 at 2:56 PM
To: "cmake@cmake.org" 
>
Subject: [EXTERNAL]: [CMake] FindProtobuf in specified dirs

Hello,

I'm working on enhancing the build process in my company by using CMake, and 
I'm having trouble to have it find the Google Protocol Buffers binary and 
libraries in a specific directory in my workspace.


Re: [CMake] [EXTERNAL]: FindProtobuf in specified dirs

2016-10-25 Thread Homero Cardoso de Almeida
That did not work. Even though I set the BUILD_DOCUMENTATION flag in the
debian/rules script, I cannot get it to skip doc build. Or maybe I'm
writing in the wrong folder, I don't know. :(


Em ter, 25 de out de 2016 às 11:35, Parag Chandra 
escreveu:

> This is a shot in the dark, but if I remember correctly, building CMake
> requires a separate version of CMake in order to bootstrap itself. So when
> you run ccmake (or cmake-gui) to configure the new version of CMake you’re
> trying to build, there might be some Boolean option in there that will
> disable doc generation completely.
>
>
>
>
>
>
>
> *Parag Chandra *Technical Lead, Mobile Team
> Mobile: +1.919.824.1410 <+1%20919-824-1410>
>
> Ionic Security Inc.
> 1170 Peachtree St. NE STE 400, Atlanta, GA 30309
>
>
>
>
>
> *From: *Homero Cardoso de Almeida 
> *Date: *Tuesday, October 25, 2016 at 9:28 AM
>
>
> *To: *Parag Chandra , "cmake@cmake.org" <
> cmake@cmake.org>
> *Subject: *Re: [EXTERNAL]: [CMake] FindProtobuf in specified dirs
>
>
>
> Actually, I'm trying to compile cmake 3.0.2 now.
>
>
>
> I did exactly that for protobuffers, and it compiled file. It's just the
> package config file that still requires 2.8.12 and I'm not sure of the
> consequences of changing that. So I'm trying to build 3.0.2 on squeeze now,
> and having a hard time building the docs because of sphinx. If I could skip
> the docs, that would be fantastic.
>
>
>
> Thanks,
>
> Homero
>
>
>
> Em ter, 25 de out de 2016 às 11:23, Parag Chandra 
> escreveu:
>
> I actually haven’t ever tried to build protobuffers myself, so I can’t
> comment on its doc generation or sphinx dependency. Sorry if this seems
> obvious, but have you tried modifying protobuffer’s CMakeLists.txt file so
> that it uses the same 2.8.9 CMake you are using? 2.8.12 may not be that far
> off from 2.8.9; it just might be the version of CMake they happened to
> download at the time, rather than a hard requirement on it.
>
>
>
>
>
>
> *Parag Chandra*
> Technical Lead, Mobile Team
> Mobile: +1.919.824.1410 <+1%20919-824-1410>
>
> Ionic Security Inc.
> 1170 Peachtree St. NE STE 400, Atlanta, GA 30309
>
>
>
>
>
> *From: *Homero Cardoso de Almeida 
> *Date: *Tuesday, October 25, 2016 at 8:06 AM
> *To: *Parag Chandra , "cmake@cmake.org" <
> cmake@cmake.org>
> *Subject: *Re: [EXTERNAL]: [CMake] FindProtobuf in specified dirs
>
>
>
> Thanks for your help.
>
>
>
> I was able to download and compile protobuffers 2.7 using cmake, however
> the cmake config for protobuffers is fixed for 2.8.12, while I need it to
> work with cmake 2.8.9 as it's going to run in system frozen in Debian
> Squeeze (Squeeze actually defaults on cmake 2.8.2 and I got it to install
> 2.8.9 from Wheezy).
>
>
>
> Currently I'm trying to create a debian package from cmake 3.0.2 on
> squeeze, but I'm having a hard time due to dependencies on sphinx. Do you
> have any ideas on how to circumvent the doc generation?
>
>
>
> Thanks and regards,
>
> Homero.
>
>
>
> Em qui, 20 de out de 2016 às 17:05, Parag Chandra 
> escreveu:
>
> I believe the protobuf-config.cmake.in generates a protobuf-config.cmake
> file once you actually use CMake to build protobuf itself.
>
>
>
>
>
>
> *Parag Chandra*
> Technical Lead, Mobile Team
> Mobile: +1.919.824.1410 <+1%20919-824-1410>
>
> Ionic Security Inc.
> 1170 Peachtree St. NE STE 400, Atlanta, GA 30309
>
>
>
>
>
> *From: *CMake  on behalf of Homero Cardoso de
> Almeida 
> *Date: *Thursday, October 20, 2016 at 2:56 PM
> *To: *"cmake@cmake.org" 
> *Subject: *[EXTERNAL]: [CMake] FindProtobuf in specified dirs
>
>
>
> Hello,
>
>
>
> I'm working on enhancing the build process in my company by using CMake,
> and I'm having trouble to have it find the Google Protocol Buffers binary
> and libraries in a specific directory in my workspace.
>
>
>
> Due to several reasons, we cannot install protobuffers directly in our
> environment, so I have it download and unpack a zip file with the
> protobuffer library and header files in a directory in my home folder.
> However, when I use the find_package directive giving said folder as a hint
> it complains that it could not find a protobuf-config.cmake file and fails.
> I couldn't find any such file anywhere, the only thing coming close is a "
> protobuf-config.cmake.in" in the protobuf source tree and I don't know if
> I can use that.
>
>
>
> Do I have to provide my own protobuf-config.cmake file, or I'm using it
> completely wrong?
>
>
>
> We are frozen in protocol buffers 2.4.1. I guess we can upgrade to 2.7.0,
> but we can't use 3.0.x.
>
>
>
> Thanks,
>
> Homero.
>
>
-- 

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 

[CMake] CPack DEB version info is missing patch level

2016-10-25 Thread cen

Hi

I am not sure if this is a CPack thing or a deb thing.

my CmakeLists.txt:

SET(VERSION_MAJOR "1")
SET(VERSION_MINOR "3")
SET(VERSION_PATCH "2")

SET(CPACK_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}")
SET(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}")
SET(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}")


Produced RPM, running rpm -qip my.rpm results in:

Version : 1.3.2


Produced DEB, running dpkg-deb -I my.deb results in:

Version: 1.3


Why is patch level not baked into the DEB but it is in RPM? If install 
the deb, soft links have the proper patch level version so I guess it is 
ultimately ok but kinda annoying.



Best regards, cen


--

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] [EXTERNAL]: CMake integration in Gradle (Android Studio)

2016-10-25 Thread Parag Chandra
Hi Robert,

I’ve been struggling with the same thing. My cross-platform build already uses 
a combination of CMake and Gradle, which enables IDE integration on all 
supported platforms except Android. When I started this project about 3 years 
ago, there weren’t any real options for native code development on Android 
inside an IDE, so I initially went down the same Ant/Eclipse path as you, 
running separate commands to build the native portions via CMake and putting 
the .so files into the right place so Eclipse would find them. Even managed to 
get debugging to work with a little coaxing.

Fast forward a couple of years and Google has completely abandoned Ant+Eclipse, 
so my custom workflow is now outdated. There is now also an explosion of 
options for working with C++ code on Android, including:

• A first-party plug-in for Visual Studio from Microsoft;
• VisualGDB;
• WinGDB;
• Gradle’s own C/C++ support via its Native Build System;
• Google’s own CMake support via Android Studio
• JetBrains CLion

I spoke to a few people at Google when I was at I/O this year, and I got the 
general impression that CMake+Gradle+Android Studio is only going to work if 
you’re targeting Android exclusively. If you want to continue targeting 
multiple platforms, you’re still kind of on your own, and your experience with 
their custom version of CMake supports that impression.

I haven’t had time to explore all of the options I listed above to try to 
figure out which would provide the best workflow, but my general sense is that 
Android Studio needs to continue to treat your CMake build as a black box. 
Fortunately, there are a lot of extension points with the Gradle-based build 
that underpins all Android Studio projects, so you can effectively create 
pre-build steps that will essentially cmake –build your native code and drop 
the .so files into the right place, before proceeding with the managed code 
Android toolchain. From there, it should be possible to attach Android Studio’s 
managed code and native code debuggers to your running app, to concurrently 
debug both sides.

At this point, I’ve probably strayed too far from the intent of this mailing 
list, but I’m happy to discuss further with you offline.

 

Parag Chandra
Technical Lead, Mobile Team
Mobile: +1.919.824.1410

Ionic Security Inc.
1170 Peachtree St. NE STE 400, Atlanta, GA 30309
 

On 10/25/16, 9:48 AM, "CMake on behalf of Robert Dailey" 
 wrote:

I'm not sure if the CMake mailing lists are the right place to ask
this question but I thought I'd ask just in case someone has gone down
this path or has experience with what Google/Gradle is actually trying
to accomplish with what seems to be a hand-built version of CMake with
custom patches that are not in upstream repositories.

Prior to switching to Android Studio / Gradle, I was using Eclipse /
Ant. The way I did CMake integration was not really integration at
all: I generated Ninja build scripts using CMake and implemented
custom targets to run "ant release" after all the C++ projects were
built. I made sure that CMake copied relevant *.so files to
appropriate directories in the Ant structure so they are packaged with
built APKs. That's how I did my Android development.

Now that I'm integrating CMake into Gradle, first annoyance I noticed
is that I can't use CMake 3.7 (or any external installation of CMake)
with Android Studio. It requires a version of CMake installed through
SDK Manager. This means I can't use the new Android toolchain
functionality built into CMake 3.7 (sad face). But this is something I
can work around...

Next I found out that stuff I'm setting in my CMake scripts, such as
CPP flags like `-std=c++14` and `-fexceptions` was not being applied.
For whatever reason, Gradle is overriding these from the command line
(I'm guessing?). So this requires me to duplicate the toolchain /
compiler flag setup I already do in my CMake scripts now in the Gradle
build scripts. This seems completely unnecessary and a maintenance
burden.

What I was expecting Gradle to do was essentially provide me some
toolchain file so that CMake can find the compiler and linker to use
and then the rest would be determined by CMake itself.

Is there a way I can tell Gradle to not take so much control over
compiler flags? I want my CMake scripts to do this. I can't imagine
they had a good reason to do this. What have others done in this
situation with their own Gradle + CMake integration? Looking for
advice here, since information is sparse, especially since the Android
Studio 2.2 CMake integration is relatively new stuff.
-- 

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 

Re: [CMake] [EXTERNAL]: FindProtobuf in specified dirs

2016-10-25 Thread Parag Chandra
I actually haven’t ever tried to build protobuffers myself, so I can’t comment 
on its doc generation or sphinx dependency. Sorry if this seems obvious, but 
have you tried modifying protobuffer’s CMakeLists.txt file so that it uses the 
same 2.8.9 CMake you are using? 2.8.12 may not be that far off from 2.8.9; it 
just might be the version of CMake they happened to download at the time, 
rather than a hard requirement on it.



Parag Chandra
Technical Lead, Mobile Team
Mobile: +1.919.824.1410

Ionic Security Inc.
1170 Peachtree St. NE STE 400, Atlanta, GA 30309




From: Homero Cardoso de Almeida 
Date: Tuesday, October 25, 2016 at 8:06 AM
To: Parag Chandra , "cmake@cmake.org" 
Subject: Re: [EXTERNAL]: [CMake] FindProtobuf in specified dirs

Thanks for your help.

I was able to download and compile protobuffers 2.7 using cmake, however the 
cmake config for protobuffers is fixed for 2.8.12, while I need it to work with 
cmake 2.8.9 as it's going to run in system frozen in Debian Squeeze (Squeeze 
actually defaults on cmake 2.8.2 and I got it to install 2.8.9 from Wheezy).

Currently I'm trying to create a debian package from cmake 3.0.2 on squeeze, 
but I'm having a hard time due to dependencies on sphinx. Do you have any ideas 
on how to circumvent the doc generation?

Thanks and regards,
Homero.

Em qui, 20 de out de 2016 às 17:05, Parag Chandra 
> escreveu:
I believe the protobuf-config.cmake.in 
generates a protobuf-config.cmake file once you actually use CMake to build 
protobuf itself.



Parag Chandra
Technical Lead, Mobile Team
Mobile: +1.919.824.1410

Ionic Security Inc.
1170 Peachtree St. NE STE 400, Atlanta, GA 30309




From: CMake > on behalf 
of Homero Cardoso de Almeida >
Date: Thursday, October 20, 2016 at 2:56 PM
To: "cmake@cmake.org" 
>
Subject: [EXTERNAL]: [CMake] FindProtobuf in specified dirs

Hello,

I'm working on enhancing the build process in my company by using CMake, and 
I'm having trouble to have it find the Google Protocol Buffers binary and 
libraries in a specific directory in my workspace.

Due to several reasons, we cannot install protobuffers directly in our 
environment, so I have it download and unpack a zip file with the protobuffer 
library and header files in a directory in my home folder. However, when I use 
the find_package directive giving said folder as a hint it complains that it 
could not find a protobuf-config.cmake file and fails. I couldn't find any such 
file anywhere, the only thing coming close is a 
"protobuf-config.cmake.in" in the protobuf 
source tree and I don't know if I can use that.

Do I have to provide my own protobuf-config.cmake file, or I'm using it 
completely wrong?

We are frozen in protocol buffers 2.4.1. I guess we can upgrade to 2.7.0, but 
we can't use 3.0.x.

Thanks,
Homero.
-- 

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.7.0-rc2-755-g24e5bff

2016-10-25 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  24e5bff0eb7e82d34775a029296858b8142ff02f (commit)
   via  69fc7bf87db33d88af02602fba811b5c5e740a70 (commit)
   via  e2ed9a70929092ab7b32e036886859e53fbff897 (commit)
   via  584ab5285b51945e0dd523caf77342985ac97ce4 (commit)
  from  a5f7a59bbb86a7cfb7792765270722f07a9a679f (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=24e5bff0eb7e82d34775a029296858b8142ff02f
commit 24e5bff0eb7e82d34775a029296858b8142ff02f
Merge: a5f7a59 69fc7bf
Author: Brad King 
AuthorDate: Tue Oct 25 09:52:56 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Oct 25 09:52:56 2016 -0400

Merge topic 'vs-toolset-options' into next

69fc7bf8 VS: Choose flag map based on the toolset name
e2ed9a70 VS: Move toolset flag table lookup to global generator
584ab528 VS: Add internal API to get platform toolset as string


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=69fc7bf87db33d88af02602fba811b5c5e740a70
commit 69fc7bf87db33d88af02602fba811b5c5e740a70
Author: Don Olmstead 
AuthorDate: Mon Oct 17 17:50:34 2016 -0700
Commit: Brad King 
CommitDate: Tue Oct 25 09:46:21 2016 -0400

VS: Choose flag map based on the toolset name

MSBuild interprets the `.vcxproj` content based on the `PlatformToolset`
setting, so our reverse mapping needs to be based on that setting too.
For VS 2010 and above, choose the flag map to match the toolset name
rather than the generator VS version.

Issue: #16153

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 09c0acf..cf9dbb8 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -680,6 +680,8 @@ if (WIN32)
   cmVisualStudioGeneratorOptions.cxx
   cmVisualStudio10TargetGenerator.h
   cmVisualStudio10TargetGenerator.cxx
+  cmVisualStudio10ToolsetOptions.h
+  cmVisualStudio10ToolsetOptions.cxx
   cmLocalVisualStudio10Generator.cxx
   cmLocalVisualStudio10Generator.h
   cmGlobalVisualStudio10Generator.h
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx 
b/Source/cmGlobalVisualStudio10Generator.cxx
index 6075e2c..7d91740 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -617,25 +617,40 @@ std::string 
cmGlobalVisualStudio10Generator::GetInstalledNsightTegraVersion()
 
 cmIDEFlagTable const* cmGlobalVisualStudio10Generator::GetClFlagTable() const
 {
-  return this->DefaultClFlagTable;
+  cmIDEFlagTable const* table = this->ToolsetOptions.GetClFlagTable(
+this->GetPlatformName(), this->GetPlatformToolsetString());
+
+  return (table != CM_NULLPTR) ? table : this->DefaultClFlagTable;
 }
 
 cmIDEFlagTable const* cmGlobalVisualStudio10Generator::GetRcFlagTable() const
 {
-  return this->DefaultRcFlagTable;
+  cmIDEFlagTable const* table = this->ToolsetOptions.GetRcFlagTable(
+this->GetPlatformName(), this->GetPlatformToolsetString());
+
+  return (table != CM_NULLPTR) ? table : this->DefaultRcFlagTable;
 }
 
 cmIDEFlagTable const* cmGlobalVisualStudio10Generator::GetLibFlagTable() const
 {
-  return this->DefaultLibFlagTable;
+  cmIDEFlagTable const* table = this->ToolsetOptions.GetLibFlagTable(
+this->GetPlatformName(), this->GetPlatformToolsetString());
+
+  return (table != CM_NULLPTR) ? table : this->DefaultLibFlagTable;
 }
 
 cmIDEFlagTable const* cmGlobalVisualStudio10Generator::GetLinkFlagTable() const
 {
-  return this->DefaultLinkFlagTable;
+  cmIDEFlagTable const* table = this->ToolsetOptions.GetLinkFlagTable(
+this->GetPlatformName(), this->GetPlatformToolsetString());
+
+  return (table != CM_NULLPTR) ? table : this->DefaultLinkFlagTable;
 }
 
 cmIDEFlagTable const* cmGlobalVisualStudio10Generator::GetMasmFlagTable() const
 {
-  return this->DefaultMasmFlagTable;
+  cmIDEFlagTable const* table = this->ToolsetOptions.GetMasmFlagTable(
+this->GetPlatformName(), this->GetPlatformToolsetString());
+
+  return (table != CM_NULLPTR) ? table : this->DefaultMasmFlagTable;
 }
diff --git a/Source/cmGlobalVisualStudio10Generator.h 
b/Source/cmGlobalVisualStudio10Generator.h
index 8418480..4175104 100644
--- a/Source/cmGlobalVisualStudio10Generator.h
+++ b/Source/cmGlobalVisualStudio10Generator.h
@@ -4,6 +4,7 @@
 #define cmGlobalVisualStudio10Generator_h
 
 #include "cmGlobalVisualStudio8Generator.h"
+#include "cmVisualStudio10ToolsetOptions.h"
 
 /** \class cmGlobalVisualStudio10Generator
  * \brief Write a Unix makefiles.
@@ -146,6 +147,7 @@ private:
 
   

Re: [CMake] [EXTERNAL]: FindProtobuf in specified dirs

2016-10-25 Thread Parag Chandra
This is a shot in the dark, but if I remember correctly, building CMake 
requires a separate version of CMake in order to bootstrap itself. So when you 
run ccmake (or cmake-gui) to configure the new version of CMake you’re trying 
to build, there might be some Boolean option in there that will disable doc 
generation completely.



Parag Chandra
Technical Lead, Mobile Team
Mobile: +1.919.824.1410

Ionic Security Inc.
1170 Peachtree St. NE STE 400, Atlanta, GA 30309




From: Homero Cardoso de Almeida 
Date: Tuesday, October 25, 2016 at 9:28 AM
To: Parag Chandra , "cmake@cmake.org" 
Subject: Re: [EXTERNAL]: [CMake] FindProtobuf in specified dirs

Actually, I'm trying to compile cmake 3.0.2 now.

I did exactly that for protobuffers, and it compiled file. It's just the 
package config file that still requires 2.8.12 and I'm not sure of the 
consequences of changing that. So I'm trying to build 3.0.2 on squeeze now, and 
having a hard time building the docs because of sphinx. If I could skip the 
docs, that would be fantastic.

Thanks,
Homero

Em ter, 25 de out de 2016 às 11:23, Parag Chandra 
> escreveu:
I actually haven’t ever tried to build protobuffers myself, so I can’t comment 
on its doc generation or sphinx dependency. Sorry if this seems obvious, but 
have you tried modifying protobuffer’s CMakeLists.txt file so that it uses the 
same 2.8.9 CMake you are using? 2.8.12 may not be that far off from 2.8.9; it 
just might be the version of CMake they happened to download at the time, 
rather than a hard requirement on it.



Parag Chandra
Technical Lead, Mobile Team
Mobile: +1.919.824.1410

Ionic Security Inc.
1170 Peachtree St. NE STE 400, Atlanta, GA 30309




From: Homero Cardoso de Almeida 
>
Date: Tuesday, October 25, 2016 at 8:06 AM
To: Parag Chandra >, 
"cmake@cmake.org" 
>
Subject: Re: [EXTERNAL]: [CMake] FindProtobuf in specified dirs

Thanks for your help.

I was able to download and compile protobuffers 2.7 using cmake, however the 
cmake config for protobuffers is fixed for 2.8.12, while I need it to work with 
cmake 2.8.9 as it's going to run in system frozen in Debian Squeeze (Squeeze 
actually defaults on cmake 2.8.2 and I got it to install 2.8.9 from Wheezy).

Currently I'm trying to create a debian package from cmake 3.0.2 on squeeze, 
but I'm having a hard time due to dependencies on sphinx. Do you have any ideas 
on how to circumvent the doc generation?

Thanks and regards,
Homero.

Em qui, 20 de out de 2016 às 17:05, Parag Chandra 
> escreveu:
I believe the protobuf-config.cmake.in 
generates a protobuf-config.cmake file once you actually use CMake to build 
protobuf itself.



Parag Chandra
Technical Lead, Mobile Team
Mobile: +1.919.824.1410

Ionic Security Inc.
1170 Peachtree St. NE STE 400, Atlanta, GA 30309




From: CMake > on behalf 
of Homero Cardoso de Almeida >
Date: Thursday, October 20, 2016 at 2:56 PM
To: "cmake@cmake.org" 
>
Subject: [EXTERNAL]: [CMake] FindProtobuf in specified dirs

Hello,

I'm working on enhancing the build process in my company by using CMake, and 
I'm having trouble to have it find the Google Protocol Buffers binary and 
libraries in a specific directory in my workspace.

Due to several reasons, we cannot install protobuffers directly in our 
environment, so I have it download and unpack a zip file with the protobuffer 
library and header files in a directory in my home folder. However, when I use 
the find_package directive giving said folder as a hint it complains that it 
could not find a protobuf-config.cmake file and fails. I couldn't find any such 
file anywhere, the only thing coming close is a 
"protobuf-config.cmake.in" in the protobuf 
source tree and I don't know if I can use that.

Do I have to provide my own protobuf-config.cmake file, or I'm using it 
completely wrong?

We are frozen in protocol buffers 2.4.1. I guess we can upgrade to 2.7.0, but 
we can't use 3.0.x.

Thanks,
Homero.
-- 

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 

[cmake-developers] CMake integration in Gradle (Android Studio)

2016-10-25 Thread Robert Dailey
I'm not sure if the CMake mailing lists are the right place to ask
this question but I thought I'd ask just in case someone has gone down
this path or has experience with what Google/Gradle is actually trying
to accomplish with what seems to be a hand-built version of CMake with
custom patches that are not in upstream repositories.

Prior to switching to Android Studio / Gradle, I was using Eclipse /
Ant. The way I did CMake integration was not really integration at
all: I generated Ninja build scripts using CMake and implemented
custom targets to run "ant release" after all the C++ projects were
built. I made sure that CMake copied relevant *.so files to
appropriate directories in the Ant structure so they are packaged with
built APKs. That's how I did my Android development.

Now that I'm integrating CMake into Gradle, first annoyance I noticed
is that I can't use CMake 3.7 (or any external installation of CMake)
with Android Studio. It requires a version of CMake installed through
SDK Manager. This means I can't use the new Android toolchain
functionality built into CMake 3.7 (sad face). But this is something I
can work around...

Next I found out that stuff I'm setting in my CMake scripts, such as
CPP flags like `-std=c++14` and `-fexceptions` was not being applied.
For whatever reason, Gradle is overriding these from the command line
(I'm guessing?). So this requires me to duplicate the toolchain /
compiler flag setup I already do in my CMake scripts now in the Gradle
build scripts. This seems completely unnecessary and a maintenance
burden.

What I was expecting Gradle to do was essentially provide me some
toolchain file so that CMake can find the compiler and linker to use
and then the rest would be determined by CMake itself.

Is there a way I can tell Gradle to not take so much control over
compiler flags? I want my CMake scripts to do this. I can't imagine
they had a good reason to do this. What have others done in this
situation with their own Gradle + CMake integration? Looking for
advice here, since information is sparse, especially since the Android
Studio 2.2 CMake integration is relatively new stuff.
-- 

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 integration in Gradle (Android Studio)

2016-10-25 Thread Robert Dailey
I'm not sure if the CMake mailing lists are the right place to ask
this question but I thought I'd ask just in case someone has gone down
this path or has experience with what Google/Gradle is actually trying
to accomplish with what seems to be a hand-built version of CMake with
custom patches that are not in upstream repositories.

Prior to switching to Android Studio / Gradle, I was using Eclipse /
Ant. The way I did CMake integration was not really integration at
all: I generated Ninja build scripts using CMake and implemented
custom targets to run "ant release" after all the C++ projects were
built. I made sure that CMake copied relevant *.so files to
appropriate directories in the Ant structure so they are packaged with
built APKs. That's how I did my Android development.

Now that I'm integrating CMake into Gradle, first annoyance I noticed
is that I can't use CMake 3.7 (or any external installation of CMake)
with Android Studio. It requires a version of CMake installed through
SDK Manager. This means I can't use the new Android toolchain
functionality built into CMake 3.7 (sad face). But this is something I
can work around...

Next I found out that stuff I'm setting in my CMake scripts, such as
CPP flags like `-std=c++14` and `-fexceptions` was not being applied.
For whatever reason, Gradle is overriding these from the command line
(I'm guessing?). So this requires me to duplicate the toolchain /
compiler flag setup I already do in my CMake scripts now in the Gradle
build scripts. This seems completely unnecessary and a maintenance
burden.

What I was expecting Gradle to do was essentially provide me some
toolchain file so that CMake can find the compiler and linker to use
and then the rest would be determined by CMake itself.

Is there a way I can tell Gradle to not take so much control over
compiler flags? I want my CMake scripts to do this. I can't imagine
they had a good reason to do this. What have others done in this
situation with their own Gradle + CMake integration? Looking for
advice here, since information is sparse, especially since the Android
Studio 2.2 CMake integration is relatively new stuff.
-- 

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] [EXTERNAL]: FindProtobuf in specified dirs

2016-10-25 Thread Homero Cardoso de Almeida
Actually, I'm trying to compile cmake 3.0.2 now.

I did exactly that for protobuffers, and it compiled file. It's just the
package config file that still requires 2.8.12 and I'm not sure of the
consequences of changing that. So I'm trying to build 3.0.2 on squeeze now,
and having a hard time building the docs because of sphinx. If I could skip
the docs, that would be fantastic.

Thanks,
Homero

Em ter, 25 de out de 2016 às 11:23, Parag Chandra 
escreveu:

> I actually haven’t ever tried to build protobuffers myself, so I can’t
> comment on its doc generation or sphinx dependency. Sorry if this seems
> obvious, but have you tried modifying protobuffer’s CMakeLists.txt file so
> that it uses the same 2.8.9 CMake you are using? 2.8.12 may not be that far
> off from 2.8.9; it just might be the version of CMake they happened to
> download at the time, rather than a hard requirement on it.
>
>
>
>
>
>
>
> *Parag Chandra *Technical Lead, Mobile Team
> Mobile: +1.919.824.1410 <+1%20919-824-1410>
>
> Ionic Security Inc.
> 1170 Peachtree St. NE STE 400, Atlanta, GA 30309
>
>
>
>
>
> *From: *Homero Cardoso de Almeida 
> *Date: *Tuesday, October 25, 2016 at 8:06 AM
> *To: *Parag Chandra , "cmake@cmake.org" <
> cmake@cmake.org>
> *Subject: *Re: [EXTERNAL]: [CMake] FindProtobuf in specified dirs
>
>
>
> Thanks for your help.
>
>
>
> I was able to download and compile protobuffers 2.7 using cmake, however
> the cmake config for protobuffers is fixed for 2.8.12, while I need it to
> work with cmake 2.8.9 as it's going to run in system frozen in Debian
> Squeeze (Squeeze actually defaults on cmake 2.8.2 and I got it to install
> 2.8.9 from Wheezy).
>
>
>
> Currently I'm trying to create a debian package from cmake 3.0.2 on
> squeeze, but I'm having a hard time due to dependencies on sphinx. Do you
> have any ideas on how to circumvent the doc generation?
>
>
>
> Thanks and regards,
>
> Homero.
>
>
>
> Em qui, 20 de out de 2016 às 17:05, Parag Chandra 
> escreveu:
>
> I believe the protobuf-config.cmake.in generates a protobuf-config.cmake
> file once you actually use CMake to build protobuf itself.
>
>
>
>
>
>
> *Parag Chandra*
> Technical Lead, Mobile Team
> Mobile: +1.919.824.1410 <+1%20919-824-1410>
>
> Ionic Security Inc.
> 1170 Peachtree St. NE STE 400, Atlanta, GA 30309
>
>
>
>
>
> *From: *CMake  on behalf of Homero Cardoso de
> Almeida 
> *Date: *Thursday, October 20, 2016 at 2:56 PM
> *To: *"cmake@cmake.org" 
> *Subject: *[EXTERNAL]: [CMake] FindProtobuf in specified dirs
>
>
>
> Hello,
>
>
>
> I'm working on enhancing the build process in my company by using CMake,
> and I'm having trouble to have it find the Google Protocol Buffers binary
> and libraries in a specific directory in my workspace.
>
>
>
> Due to several reasons, we cannot install protobuffers directly in our
> environment, so I have it download and unpack a zip file with the
> protobuffer library and header files in a directory in my home folder.
> However, when I use the find_package directive giving said folder as a hint
> it complains that it could not find a protobuf-config.cmake file and fails.
> I couldn't find any such file anywhere, the only thing coming close is a "
> protobuf-config.cmake.in" in the protobuf source tree and I don't know if
> I can use that.
>
>
>
> Do I have to provide my own protobuf-config.cmake file, or I'm using it
> completely wrong?
>
>
>
> We are frozen in protocol buffers 2.4.1. I guess we can upgrade to 2.7.0,
> but we can't use 3.0.x.
>
>
>
> Thanks,
>
> Homero.
>
>
-- 

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.7.0-rc2-751-ga5f7a59

2016-10-25 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  a5f7a59bbb86a7cfb7792765270722f07a9a679f (commit)
   via  51cfba8c219a923c924349cd255a523eb797e104 (commit)
   via  53862f04a0002894c0ef5aeb23d52495e5abe60d (commit)
  from  7d6e8599e87ee212861488f62f726afe0fd927db (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=a5f7a59bbb86a7cfb7792765270722f07a9a679f
commit a5f7a59bbb86a7cfb7792765270722f07a9a679f
Merge: 7d6e859 51cfba8
Author: Brad King 
AuthorDate: Tue Oct 25 09:15:53 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Oct 25 09:15:53 2016 -0400

Merge topic 'update-kwsys' into next

51cfba8c Merge branch 'upstream-KWSys' into update-kwsys
53862f04 KWSys 2016-10-23 (b630d2f5)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=51cfba8c219a923c924349cd255a523eb797e104
commit 51cfba8c219a923c924349cd255a523eb797e104
Merge: 2a567c6 53862f0
Author: Brad King 
AuthorDate: Tue Oct 25 09:13:48 2016 -0400
Commit: Brad King 
CommitDate: Tue Oct 25 09:13:48 2016 -0400

Merge branch 'upstream-KWSys' into update-kwsys

* upstream-KWSys:
  KWSys 2016-10-23 (b630d2f5)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=53862f04a0002894c0ef5aeb23d52495e5abe60d
commit 53862f04a0002894c0ef5aeb23d52495e5abe60d
Author: KWSys Upstream 
AuthorDate: Sun Oct 23 04:32:36 2016 +0300
Commit: Brad King 
CommitDate: Tue Oct 25 09:13:46 2016 -0400

KWSys 2016-10-23 (b630d2f5)

Code extracted from:

http://public.kitware.com/KWSys.git

at commit b630d2f5575be7d70c214bfffc57aaf5069c6369 (master).

Upstream Shortlog
-

Dāvis Mosāns (1):
  b630d2f5 ConsoleBuf: Check for actual console with GetConsoleMode

diff --git a/ConsoleBuf.hxx.in b/ConsoleBuf.hxx.in
index 8aeeda1..2496b45 100644
--- a/ConsoleBuf.hxx.in
+++ b/ConsoleBuf.hxx.in
@@ -239,8 +239,12 @@ namespace @KWSYS_NAMESPACE@
 m_activeInputCodepage = input_file_codepage;
 break;
   case FILE_TYPE_CHAR:
-m_isConsoleInput = true;
-break;
+// Check for actual console.
+DWORD consoleMode;
+m_isConsoleInput = GetConsoleMode(m_hInput, ) == 0 ? 
false : true;
+if (m_isConsoleInput) {
+  break;
+}
   case FILE_TYPE_PIPE:
 m_activeInputCodepage = input_pipe_codepage;
 break;
@@ -259,8 +263,12 @@ namespace @KWSYS_NAMESPACE@
 m_activeOutputCodepage = output_file_codepage;
 break;
   case FILE_TYPE_CHAR:
-m_isConsoleOutput = true;
-break;
+// Check for actual console.
+DWORD consoleMode;
+m_isConsoleOutput = GetConsoleMode(m_hOutput, ) == 0 ? 
false : true;
+if (m_isConsoleOutput) {
+  break;
+}
   case FILE_TYPE_PIPE:
 m_activeOutputCodepage = output_pipe_codepage;
 break;

---

Summary of changes:
 Source/kwsys/ConsoleBuf.hxx.in |   16 
 1 file changed, 12 insertions(+), 4 deletions(-)


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.7.0-rc2-748-g7d6e859

2016-10-25 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  7d6e8599e87ee212861488f62f726afe0fd927db (commit)
   via  2a567c68ce6605071f3e21638560493b71ed2841 (commit)
   via  4ec0329bf1cc39eddfa9dd5c58e83992b8979181 (commit)
   via  de21e564e8a2e53f6982ef8994fd6758170a (commit)
   via  69a7309cebb95858382ecf2437e3b7dfb19c967d (commit)
   via  6cd02f08c730449a4275830cb321a14ea51051ab (commit)
   via  22ef70499e4fe102fb78b761d73f47864ecb50ab (commit)
   via  6bc03a285fdf3c116e3078f0ed35f41c67788085 (commit)
   via  914874fdd1fecf8a5227e50ecf32c4322183f26f (commit)
  from  06f7f9f2fac3ff31f8ea909c0a5cd647e8912059 (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=7d6e8599e87ee212861488f62f726afe0fd927db
commit 7d6e8599e87ee212861488f62f726afe0fd927db
Merge: 06f7f9f 2a567c6
Author: Brad King 
AuthorDate: Tue Oct 25 09:12:18 2016 -0400
Commit: Brad King 
CommitDate: Tue Oct 25 09:12:18 2016 -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, release, updated. v3.7.0-rc2-15-g4ec0329

2016-10-25 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, release has been updated
   via  4ec0329bf1cc39eddfa9dd5c58e83992b8979181 (commit)
   via  de21e564e8a2e53f6982ef8994fd6758170a (commit)
   via  9b8dc79cc84d12c1e661ca3cd77b773b463508d7 (commit)
   via  881585f9757972473519d5394ea04a7d962ac70e (commit)
   via  69a7309cebb95858382ecf2437e3b7dfb19c967d (commit)
   via  4c272adbe1d67af4779f4e72d9562457ed851dac (commit)
   via  6205f1797e33c22ab1f9cda8598d02b24497b806 (commit)
   via  6cd02f08c730449a4275830cb321a14ea51051ab (commit)
   via  42db2ebc756a48ecdb15841c18747cb69e9df11f (commit)
   via  22ef70499e4fe102fb78b761d73f47864ecb50ab (commit)
   via  48189697eb2ac97407cf4ffc0d2f3e600f3cd6ac (commit)
   via  6bc03a285fdf3c116e3078f0ed35f41c67788085 (commit)
   via  295c8efa359cbee22e45e6e9358990209b35aa39 (commit)
   via  914874fdd1fecf8a5227e50ecf32c4322183f26f (commit)
   via  43f4326ece5035a5a028a7bb90a67c193804c997 (commit)
  from  876da11858ab6649bb088c4bb7758fc84910ba20 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
---

Summary of changes:
 Help/manual/cmake-server.7.rst |  237 +---
 Modules/Compiler/Intel-C.cmake |9 +-
 Modules/Compiler/Intel-CXX.cmake   |9 +-
 Modules/Platform/Android-Common.cmake  |4 +
 Modules/Platform/Android/abi-arm64-v8a-Clang.cmake |5 +-
 Modules/Platform/Android/abi-arm64-v8a-GNU.cmake   |6 +-
 Modules/Platform/Android/abi-armeabi-Clang.cmake   |1 -
 Modules/Platform/Android/abi-armeabi-GNU.cmake |1 -
 .../Platform/Android/abi-armeabi-v6-Clang.cmake|1 -
 Modules/Platform/Android/abi-armeabi-v6-GNU.cmake  |1 -
 .../Platform/Android/abi-armeabi-v7a-Clang.cmake   |1 -
 Modules/Platform/Android/abi-armeabi-v7a-GNU.cmake |1 -
 Modules/Platform/Android/abi-common.cmake  |   15 ++
 Modules/Platform/Android/abi-mips-Clang.cmake  |4 -
 Modules/Platform/Android/abi-mips-GNU.cmake|3 -
 Modules/Platform/Android/abi-mips64-Clang.cmake|4 -
 Modules/Platform/Android/abi-mips64-GNU.cmake  |3 -
 Modules/Platform/Android/abi-x86-Clang.cmake   |4 -
 Modules/Platform/Android/abi-x86_64-Clang.cmake|4 -
 Modules/Platform/Android/ndk-stl-c++_static.cmake  |2 +
 Source/cmGlobalNinjaGenerator.cxx  |   44 ++--
 Source/cmGlobalNinjaGenerator.h|1 -
 Source/cmServerDictionary.h|4 +-
 Tests/RunCMake/Android/RunCMakeTest.cmake  |5 -
 Tests/RunCMake/Ninja/RunCMakeTest.cmake|9 +
 Tests/RunCMake/Ninja/SubDir.cmake  |1 +
 Tests/RunCMake/Ninja/SubDirBinary-build-stdout.txt |1 +
 .../RunCMake/Ninja/SubDirBinary-install-stdout.txt |1 +
 Tests/RunCMake/Ninja/SubDirBinary-test-stdout.txt  |1 +
 Tests/RunCMake/Ninja/SubDirSource/CMakeLists.txt   |6 +
 Tests/Server/cmakelib.py   |   10 +-
 31 files changed, 182 insertions(+), 216 deletions(-)
 create mode 100644 Tests/RunCMake/Ninja/SubDirBinary-build-stdout.txt
 create mode 100644 Tests/RunCMake/Ninja/SubDirBinary-install-stdout.txt
 create mode 100644 Tests/RunCMake/Ninja/SubDirBinary-test-stdout.txt
 create mode 100644 Tests/RunCMake/Ninja/SubDirSource/CMakeLists.txt


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


Re: [CMake] Prevent ExternalProject from updating git submodules

2016-10-25 Thread David Cole via CMake
Sounds like you should consider customizing the git clone with 
DOWNLOAD_COMMAND. You can do anything you want as a customization...

HTH,
David


> On Oct 24, 2016, at 11:35 PM, Timothy Rae  wrote:
> 
> Thanks for the tip, but I'd rather it didn't fetch the documentation 
> submodule at all, as this unnecessarily slows down the build.
> 
>> On Tue, Oct 25, 2016 at 12:29 PM, Hendrik Sattler  
>> wrote:
>> Hi,
>> 
>> you can tell git where your copy of tree remote url is. This is 
>> site-specific and does not change the repository:
>> git config remote."$origirl".url "$newurl"
>> 
>> HS
>> 
>> 
>> Am 25. Oktober 2016 03:52:12 MESZ, schrieb Tim Rae :
>> >Hi all,
>> >
>> >I'm using ExternalProject_Add to add the popular C++ library range-v3
>> >to
>> >one of our projects. However, since the build server only has local
>> >intranet access, and therefore can't access the main github repository,
>> >
>> >we have put a clone of that repo on our local gitlab:
>> >
>> >ExternalProject_Add(range-v3
>> > PREFIX ${PREFIX_DIR}
>> > GIT_REPOSITORY ${LOCAL_GITLAB_URI}
>> >)
>> >
>> >The problem is that range-v3 has a documentation submodule that points
>> >to github, so `git clone ${LOCAL_GITLAB_URI} --recursive` would fail
>> >when github is inaccessible, whereas git clone works fine without the
>> >recursive flag.
>> >
>> >I found a previous message from Tim Gallagher on the mailing list
>> >reporting the same problem, but it looks like the issue was never
>> >addressed upstream.
>> >
>> >https://cmake.org/pipermail/cmake/2015-March/060100.html
>> >
>> >Unfortunately, specifying GIT_SUBMODULES "" will add all submodules, so
>> >
>> >it doesn't appear that variable will help to solve the issue. I would
>> >suggest either having a special value like "__NONE__", or having a new
>> >boolean variable like INIT_GIT_SUBMODULES; either of which can be used
>> >to disable the automatic initialization of submodules entirely.
>> >
>> >You could also change the default to NOT pull in submodules. This would
>> >
>> >be much better IMHO, as the current behavior is unintuitive. Most
>> >developers (e.g. myself until yesterday) don't even know what a
>> >submodule is, and are only familiar with using git clone, as opposed to
>> >
>> >git clone --recursive. Obviously this would be a breaking change
>> >though,
>> >so I understand that you probably don't want to go with this option.
>> >
>> >For now I have "solved" the problem by adding a new commit to our
>> >range-v3 fork removing all git submodules, however this makes it more
>> >difficult to get the upstream changes in, so I highly recommend adding
>> >an option to disable the automatic initialization of git submodules.
>> >
>> >Best regards,
>> >Tim
>> >
>> >--
>> >*This correspondence (including any attachments) is for the intended
>> >recipient(s) only. It may contain confidential or privileged
>> >information or
>> >both. No confidentiality or privilege is waived or lost by any
>> >mis-transmission. If you receive this correspondence by mistake, please
>> >
>> >contact the sender immediately, delete this correspondence (and all
>> >attachments) and destroy any hard copies. You must not use, disclose,
>> >copy,
>> >distribute or rely on any part of this correspondence (including any
>> >attachments) if you are not the intended recipient(s). 本
>> >メッセージに記載および添付されている情報 (以 下、総称して「本情報」といいます。)は、本来の受信者による使用のみを 意
>> >図しています。誤送信等により
>> >本 情報を取得された場合でも、本情報に係る 秘 密、または法律上の秘匿特権が失われるものではありません。本電子メールを 受
>> >取られた方が、本来の受
>> >信者ではない場合には、本情報及びそのコピー すべ てを削除・破棄し、本電子メールが誤って届い た旨を発信者宛てにご通知下さい ま
>> >すようお願いしま
>> >す。本情報の閲覧、発信または本情報に基づく いかなる行 為も明確に禁止されていることをご了承くださ い。*
>> >--
>> >
>> >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
>> 
>> --
>> Diese Nachricht wurde von meinem Android-Mobiltelefon mit K-9 Mail gesendet.
>> 
> 
> 
> This correspondence (including any attachments) is for the intended 
> recipient(s) only. It may contain confidential or privileged information or 
> both. No confidentiality or privilege is waived or lost by any 
> mis-transmission. If you receive this correspondence by mistake, please 
> contact the sender immediately, delete this correspondence (and all 
> attachments) and destroy any hard copies. You must not use, disclose, copy, 
> distribute or rely on any part of this 

[Cmake-commits] CMake branch, master, updated. v3.7.0-rc2-346-g2a567c6

2016-10-25 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  2a567c68ce6605071f3e21638560493b71ed2841 (commit)
   via  4ec0329bf1cc39eddfa9dd5c58e83992b8979181 (commit)
   via  de21e564e8a2e53f6982ef8994fd6758170a (commit)
   via  69a7309cebb95858382ecf2437e3b7dfb19c967d (commit)
   via  6cd02f08c730449a4275830cb321a14ea51051ab (commit)
   via  22ef70499e4fe102fb78b761d73f47864ecb50ab (commit)
   via  6bc03a285fdf3c116e3078f0ed35f41c67788085 (commit)
   via  914874fdd1fecf8a5227e50ecf32c4322183f26f (commit)
  from  c9108c7b81fecb26924596d55a84fc849125507c (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.7.0-rc2-739-g06f7f9f

2016-10-25 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  06f7f9f2fac3ff31f8ea909c0a5cd647e8912059 (commit)
   via  c9108c7b81fecb26924596d55a84fc849125507c (commit)
   via  bdc88646c1336a209d16de14bd23eb436565363d (commit)
   via  61758bf4b9b5d28cec11d2ea68b9e53ad2769ca6 (commit)
   via  3062b8a046b24e4c28b374b5c4235bb0da0a2a2c (commit)
   via  644ff572f736ff04f927661fa5bd2283cd3ee3e1 (commit)
   via  9430125511865b65e2fa897c59c70414238fbf91 (commit)
   via  9a399c27a8c6e9a264cbabf9bb3b091b2e74a71f (commit)
   via  c1a520513d4c7504fc9e9e4d9e56acc24569f490 (commit)
  from  cc04b2272954e90e97af212ab76ba8322bf225d4 (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=06f7f9f2fac3ff31f8ea909c0a5cd647e8912059
commit 06f7f9f2fac3ff31f8ea909c0a5cd647e8912059
Merge: cc04b22 c9108c7
Author: Brad King 
AuthorDate: Tue Oct 25 09:09:23 2016 -0400
Commit: Brad King 
CommitDate: Tue Oct 25 09:09:23 2016 -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


[Cmake-commits] CMake branch, master, updated. v3.7.0-rc2-330-g644ff57

2016-10-25 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  644ff572f736ff04f927661fa5bd2283cd3ee3e1 (commit)
   via  4c272adbe1d67af4779f4e72d9562457ed851dac (commit)
   via  6205f1797e33c22ab1f9cda8598d02b24497b806 (commit)
  from  9430125511865b65e2fa897c59c70414238fbf91 (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=644ff572f736ff04f927661fa5bd2283cd3ee3e1
commit 644ff572f736ff04f927661fa5bd2283cd3ee3e1
Merge: 9430125 4c272ad
Author: Brad King 
AuthorDate: Tue Oct 25 09:08:55 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Oct 25 09:08:55 2016 -0400

Merge topic 'android-pic'

4c272adb Android: Link position-independent executables with proper flags
6205f179 Android: Set CMAKE_POSITION_INDEPENDENT_CODE automatically


---

Summary of changes:
 Modules/Platform/Android/abi-arm64-v8a-Clang.cmake   |4 
 Modules/Platform/Android/abi-arm64-v8a-GNU.cmake |3 ---
 Modules/Platform/Android/abi-armeabi-Clang.cmake |1 -
 Modules/Platform/Android/abi-armeabi-GNU.cmake   |1 -
 Modules/Platform/Android/abi-armeabi-v6-Clang.cmake  |1 -
 Modules/Platform/Android/abi-armeabi-v6-GNU.cmake|1 -
 Modules/Platform/Android/abi-armeabi-v7a-Clang.cmake |1 -
 Modules/Platform/Android/abi-armeabi-v7a-GNU.cmake   |1 -
 Modules/Platform/Android/abi-common.cmake|9 +
 Modules/Platform/Android/abi-mips-Clang.cmake|4 
 Modules/Platform/Android/abi-mips-GNU.cmake  |3 ---
 Modules/Platform/Android/abi-mips64-Clang.cmake  |4 
 Modules/Platform/Android/abi-mips64-GNU.cmake|3 ---
 Modules/Platform/Android/abi-x86-Clang.cmake |4 
 Modules/Platform/Android/abi-x86_64-Clang.cmake  |4 
 15 files changed, 9 insertions(+), 35 deletions(-)


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.7.0-rc2-332-g3062b8a

2016-10-25 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  3062b8a046b24e4c28b374b5c4235bb0da0a2a2c (commit)
   via  9f1429e274df81344d260c8e42b3387a402940f1 (commit)
  from  644ff572f736ff04f927661fa5bd2283cd3ee3e1 (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=3062b8a046b24e4c28b374b5c4235bb0da0a2a2c
commit 3062b8a046b24e4c28b374b5c4235bb0da0a2a2c
Merge: 644ff57 9f1429e
Author: Brad King 
AuthorDate: Tue Oct 25 09:08:58 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Oct 25 09:08:58 2016 -0400

Merge topic 'st2-fix-regex'

9f1429e2 Sublime: Update generated diagnostic matching expression for MSVC


---

Summary of changes:
 Source/cmExtraSublimeTextGenerator.cxx |4 +++-
 1 file changed, 3 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, master, updated. v3.7.0-rc2-336-gbdc8864

2016-10-25 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  bdc88646c1336a209d16de14bd23eb436565363d (commit)
   via  15aa814b85a90fb8e8798eb99617d27957c28f36 (commit)
  from  61758bf4b9b5d28cec11d2ea68b9e53ad2769ca6 (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=bdc88646c1336a209d16de14bd23eb436565363d
commit bdc88646c1336a209d16de14bd23eb436565363d
Merge: 61758bf 15aa814
Author: Brad King 
AuthorDate: Tue Oct 25 09:09:04 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Oct 25 09:09:04 2016 -0400

Merge topic 'remove-cmobject'

15aa814b Remove cmObject.h and cmTypeMacro.h


---

Summary of changes:
 Source/CPack/IFW/cmCPackIFWGenerator.h|1 -
 Source/CPack/cmCPack7zGenerator.h |1 -
 Source/CPack/cmCPackArchiveGenerator.h|1 -
 Source/CPack/cmCPackDebGenerator.h|1 -
 Source/CPack/cmCPackGenerator.h   |2 -
 Source/CPack/cmCPackGeneratorFactory.h|3 --
 Source/CPack/cmCPackLog.h |3 --
 Source/CPack/cmCPackNSISGenerator.h   |1 -
 Source/CPack/cmCPackPKGGenerator.h|3 ++
 Source/CPack/cmCPackRPMGenerator.h|1 -
 Source/CPack/cmCPackSTGZGenerator.h   |1 -
 Source/CPack/cmCPackTGZGenerator.h|1 -
 Source/CPack/cmCPackTXZGenerator.h|1 -
 Source/CPack/cmCPackTarBZip2Generator.h   |1 -
 Source/CPack/cmCPackTarCompressGenerator.h|1 -
 Source/CPack/cmCPackZIPGenerator.h|1 -
 Source/CPack/cpack.cxx|1 -
 Source/CTest/cmCTestBuildAndTestHandler.h |1 -
 Source/CTest/cmCTestBuildCommand.h|1 -
 Source/CTest/cmCTestBuildHandler.h|1 -
 Source/CTest/cmCTestConfigureCommand.h|1 -
 Source/CTest/cmCTestConfigureHandler.h|1 -
 Source/CTest/cmCTestCoverageCommand.h |1 -
 Source/CTest/cmCTestCoverageHandler.h |1 -
 Source/CTest/cmCTestEmptyBinaryDirectoryCommand.h |1 -
 Source/CTest/cmCTestGenericHandler.h  |1 -
 Source/CTest/cmCTestHandlerCommand.h  |1 -
 Source/CTest/cmCTestMemCheckCommand.h |1 -
 Source/CTest/cmCTestMemCheckHandler.h |1 -
 Source/CTest/cmCTestReadCustomFilesCommand.h  |1 -
 Source/CTest/cmCTestRunScriptCommand.h|1 -
 Source/CTest/cmCTestScriptHandler.h   |1 -
 Source/CTest/cmCTestSleepCommand.h|1 -
 Source/CTest/cmCTestStartCommand.h|1 -
 Source/CTest/cmCTestSubmitCommand.h   |1 -
 Source/CTest/cmCTestSubmitHandler.h   |1 -
 Source/CTest/cmCTestTestCommand.h |1 -
 Source/CTest/cmCTestTestHandler.h |1 -
 Source/CTest/cmCTestUpdateCommand.h   |1 -
 Source/CTest/cmCTestUpdateHandler.h   |1 -
 Source/CTest/cmCTestUploadCommand.h   |1 -
 Source/CTest/cmCTestUploadHandler.h   |1 -
 Source/cmAddCompileOptionsCommand.h   |1 -
 Source/cmAuxSourceDirectoryCommand.h  |1 -
 Source/cmBuildNameCommand.h   |1 -
 Source/cmCMakeHostSystemInformationCommand.h  |1 -
 Source/cmCommand.h|2 -
 Source/cmElseIfCommand.h  |1 -
 Source/cmExportCommand.h  |1 -
 Source/cmExportLibraryDependenciesCommand.h   |1 -
 Source/cmFLTKWrapUICommand.h  |1 -
 Source/cmIncludeExternalMSProjectCommand.h|1 -
 Source/cmInstallProgramsCommand.h |1 -
 Source/cmLinkLibrariesCommand.h   |1 -
 Source/cmLoadCacheCommand.h   |1 -
 Source/cmLoadCommandCommand.h |1 -
 Source/cmObject.h |   41 -
 Source/cmOutputRequiredFilesCommand.h |1 -
 Source/cmQTWrapCPPCommand.h   |1 -
 Source/cmQTWrapUICommand.h|1 -
 Source/cmRemoveCommand.h  |1 -
 Source/cmRemoveDefinitionsCommand.h   |1 -
 Source/cmSourceGroupCommand.h |1 -
 Source/cmStandardIncludes.h  

[Cmake-commits] CMake branch, master, updated. v3.7.0-rc2-334-g61758bf

2016-10-25 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  61758bf4b9b5d28cec11d2ea68b9e53ad2769ca6 (commit)
   via  881585f9757972473519d5394ea04a7d962ac70e (commit)
  from  3062b8a046b24e4c28b374b5c4235bb0da0a2a2c (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=61758bf4b9b5d28cec11d2ea68b9e53ad2769ca6
commit 61758bf4b9b5d28cec11d2ea68b9e53ad2769ca6
Merge: 3062b8a 881585f
Author: Brad King 
AuthorDate: Tue Oct 25 09:09:01 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Oct 25 09:09:01 2016 -0400

Merge topic 'intel-compile-features-windows'

881585f9 Intel: Fix compiler extension flags on Windows


---

Summary of changes:
 Modules/Compiler/Intel-C.cmake   |9 ++---
 Modules/Compiler/Intel-CXX.cmake |9 ++---
 2 files changed, 12 insertions(+), 6 deletions(-)


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.7.0-rc2-338-gc9108c7

2016-10-25 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  c9108c7b81fecb26924596d55a84fc849125507c (commit)
   via  c15dc1972839e175afaa9011f74376dadf08277f (commit)
  from  bdc88646c1336a209d16de14bd23eb436565363d (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=c9108c7b81fecb26924596d55a84fc849125507c
commit c9108c7b81fecb26924596d55a84fc849125507c
Merge: bdc8864 c15dc19
Author: Brad King 
AuthorDate: Tue Oct 25 09:09:09 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Oct 25 09:09:09 2016 -0400

Merge topic 'cm_unordered_set'

c15dc197 Introduce CM_UNORDERED_SET


---

Summary of changes:
 Source/cmGeneratorTarget.cxx|   49 ---
 Source/cmTarget.cxx |   13 ++
 Source/cmTargetPropertyComputer.cxx |   13 ++
 Source/cm_unordered_set.hxx |   25 ++
 4 files changed, 51 insertions(+), 49 deletions(-)
 create mode 100644 Source/cm_unordered_set.hxx


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.7.0-rc2-327-g9430125

2016-10-25 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  9430125511865b65e2fa897c59c70414238fbf91 (commit)
   via  87cc9bfc3c6892c93e10f73421e2b0fdba06b8e9 (commit)
   via  e983bd326a9e3b7902d8f7cf0d891030ad3bd4c1 (commit)
   via  42db2ebc756a48ecdb15841c18747cb69e9df11f (commit)
  from  9a399c27a8c6e9a264cbabf9bb3b091b2e74a71f (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=9430125511865b65e2fa897c59c70414238fbf91
commit 9430125511865b65e2fa897c59c70414238fbf91
Merge: 9a399c2 87cc9bf
Author: Brad King 
AuthorDate: Tue Oct 25 09:08:51 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Oct 25 09:08:51 2016 -0400

Merge topic 'ninja-subdir-binary-dir'

87cc9bfc Merge branch 'backport-ninja-subdir-binary-dir' into 
ninja-subdir-binary-dir
e983bd32 Ninja: Use binary dir for `$subdir/all` targets
42db2ebc Ninja: Use binary dir for `$subdir/all` targets


---

Summary of changes:
 Source/cmGlobalNinjaGenerator.cxx  |   44 +++-
 Source/cmGlobalNinjaGenerator.h|1 -
 Tests/RunCMake/Ninja/RunCMakeTest.cmake|9 
 Tests/RunCMake/Ninja/SubDir.cmake  |1 +
 Tests/RunCMake/Ninja/SubDirBinary-build-stdout.txt |1 +
 .../RunCMake/Ninja/SubDirBinary-install-stdout.txt |1 +
 Tests/RunCMake/Ninja/SubDirBinary-test-stdout.txt  |1 +
 Tests/RunCMake/Ninja/SubDirSource/CMakeLists.txt   |6 +++
 8 files changed, 35 insertions(+), 29 deletions(-)
 create mode 100644 Tests/RunCMake/Ninja/SubDirBinary-build-stdout.txt
 create mode 100644 Tests/RunCMake/Ninja/SubDirBinary-install-stdout.txt
 create mode 100644 Tests/RunCMake/Ninja/SubDirBinary-test-stdout.txt
 create mode 100644 Tests/RunCMake/Ninja/SubDirSource/CMakeLists.txt


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.7.0-rc2-323-g9a399c2

2016-10-25 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  9a399c27a8c6e9a264cbabf9bb3b091b2e74a71f (commit)
   via  9b8dc79cc84d12c1e661ca3cd77b773b463508d7 (commit)
  from  c1a520513d4c7504fc9e9e4d9e56acc24569f490 (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=9a399c27a8c6e9a264cbabf9bb3b091b2e74a71f
commit 9a399c27a8c6e9a264cbabf9bb3b091b2e74a71f
Merge: c1a5205 9b8dc79
Author: Brad King 
AuthorDate: Tue Oct 25 09:08:49 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Oct 25 09:08:49 2016 -0400

Merge topic 'cmake-server-message-quoting'

9b8dc79c cmake-server: Change message wrapper to avoid ambiguity with 
content


---

Summary of changes:
 Help/manual/cmake-server.7.rst |  108 
 Source/cmServerDictionary.h|4 +-
 Tests/Server/cmakelib.py   |   10 ++--
 3 files changed, 61 insertions(+), 61 deletions(-)


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.7.0-rc2-730-gcc04b22

2016-10-25 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  cc04b2272954e90e97af212ab76ba8322bf225d4 (commit)
   via  87cc9bfc3c6892c93e10f73421e2b0fdba06b8e9 (commit)
   via  42db2ebc756a48ecdb15841c18747cb69e9df11f (commit)
  from  1529102dab129c3d2e1010f1e37544fd4a698f5d (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=cc04b2272954e90e97af212ab76ba8322bf225d4
commit cc04b2272954e90e97af212ab76ba8322bf225d4
Merge: 1529102 87cc9bf
Author: Brad King 
AuthorDate: Tue Oct 25 09:05:08 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Oct 25 09:05:08 2016 -0400

Merge topic 'ninja-subdir-binary-dir' into next

87cc9bfc Merge branch 'backport-ninja-subdir-binary-dir' into 
ninja-subdir-binary-dir
42db2ebc Ninja: Use binary dir for `$subdir/all` targets


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=87cc9bfc3c6892c93e10f73421e2b0fdba06b8e9
commit 87cc9bfc3c6892c93e10f73421e2b0fdba06b8e9
Merge: e983bd3 42db2eb
Author: Brad King 
AuthorDate: Mon Oct 24 10:30:52 2016 -0400
Commit: Brad King 
CommitDate: Mon Oct 24 10:30:52 2016 -0400

Merge branch 'backport-ninja-subdir-binary-dir' into ninja-subdir-binary-dir


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=42db2ebc756a48ecdb15841c18747cb69e9df11f
commit 42db2ebc756a48ecdb15841c18747cb69e9df11f
Author: Alexis Murzeau 
AuthorDate: Sun Oct 23 18:58:28 2016 +0200
Commit: Brad King 
CommitDate: Mon Oct 24 09:49:23 2016 -0400

Ninja: Use binary dir for `$subdir/all` targets

The targets added by commit v3.6.0-rc1~240^2~2 (Ninja: Add `$subdir/all`
targets, 2016-03-11) use as `$subdir` the relative path from the top of
the source tree to the current source directory.  This is not correct
when using `add_subdirectory(test test_bin)`.  Instead we need to use
the relative path from the top of the binary tree to the current binary
directory as was done for related targets by commit v3.7.0-rc1~268^2
(Ninja: Add `$subdir/{test,install,package}` targets, 2016-08-05).

diff --git a/Source/cmGlobalNinjaGenerator.cxx 
b/Source/cmGlobalNinjaGenerator.cxx
index f5a0e68..5e6036d 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -843,20 +843,6 @@ std::string 
cmGlobalNinjaGenerator::ConvertToNinjaPath(const std::string& path)
   return convPath;
 }
 
-std::string cmGlobalNinjaGenerator::ConvertToNinjaFolderRule(
-  const std::string& path)
-{
-  cmLocalNinjaGenerator* ng =
-static_cast(this->LocalGenerators[0]);
-  std::string convPath = ng->ConvertToRelativePath(
-this->LocalGenerators[0]->GetState()->GetSourceDirectory(), path + "/all");
-  convPath = this->NinjaOutputPath(convPath);
-#ifdef _WIN32
-  std::replace(convPath.begin(), convPath.end(), '/', '\\');
-#endif
-  return convPath;
-}
-
 void cmGlobalNinjaGenerator::AddCXXCompileCommand(
   const std::string& commandLine, const std::string& sourceFile)
 {
@@ -1083,11 +1069,11 @@ void 
cmGlobalNinjaGenerator::WriteFolderTargets(std::ostream& os)
  this->LocalGenerators.begin();
lgi != this->LocalGenerators.end(); ++lgi) {
 cmLocalGenerator const* lg = *lgi;
-const std::string currentSourceFolder(
-  lg->GetStateSnapshot().GetDirectory().GetCurrentSource());
+const std::string currentBinaryFolder(
+  lg->GetStateSnapshot().GetDirectory().GetCurrentBinary());
 // The directory-level rule should depend on the target-level rules
 // for all targets in the directory.
-targetsPerFolder[currentSourceFolder] = cmNinjaDeps();
+targetsPerFolder[currentBinaryFolder] = cmNinjaDeps();
 for (std::vector::const_iterator ti =
lg->GetGeneratorTargets().begin();
  ti != lg->GetGeneratorTargets().end(); ++ti) {
@@ -1098,7 +1084,7 @@ void 
cmGlobalNinjaGenerator::WriteFolderTargets(std::ostream& os)
type == cmState::MODULE_LIBRARY ||
type == cmState::OBJECT_LIBRARY || type == cmState::UTILITY) &&
   !gt->GetPropertyAsBool("EXCLUDE_FROM_ALL")) {
-targetsPerFolder[currentSourceFolder].push_back(gt->GetName());
+targetsPerFolder[currentBinaryFolder].push_back(gt->GetName());
   }
 }
 
@@ -1109,28 +1095,30 @@ void 
cmGlobalNinjaGenerator::WriteFolderTargets(std::ostream& os)
 for (std::vector::const_iterator stateIt =
children.begin();
  stateIt != children.end(); ++stateIt) {
-  

Re: [CMake] [EXTERNAL]: FindProtobuf in specified dirs

2016-10-25 Thread Homero Cardoso de Almeida
Thanks for your help.

I was able to download and compile protobuffers 2.7 using cmake, however
the cmake config for protobuffers is fixed for 2.8.12, while I need it to
work with cmake 2.8.9 as it's going to run in system frozen in Debian
Squeeze (Squeeze actually defaults on cmake 2.8.2 and I got it to install
2.8.9 from Wheezy).

Currently I'm trying to create a debian package from cmake 3.0.2 on
squeeze, but I'm having a hard time due to dependencies on sphinx. Do you
have any ideas on how to circumvent the doc generation?

Thanks and regards,
Homero.

Em qui, 20 de out de 2016 às 17:05, Parag Chandra 
escreveu:

> I believe the protobuf-config.cmake.in generates a protobuf-config.cmake
> file once you actually use CMake to build protobuf itself.
>
>
>
>
>
>
>
> *Parag Chandra *Technical Lead, Mobile Team
> Mobile: +1.919.824.1410 <+1%20919-824-1410>
>
> Ionic Security Inc.
> 1170 Peachtree St. NE STE 400, Atlanta, GA 30309
>
>
>
>
>
> *From: *CMake  on behalf of Homero Cardoso de
> Almeida 
> *Date: *Thursday, October 20, 2016 at 2:56 PM
> *To: *"cmake@cmake.org" 
> *Subject: *[EXTERNAL]: [CMake] FindProtobuf in specified dirs
>
>
>
> Hello,
>
>
>
> I'm working on enhancing the build process in my company by using CMake,
> and I'm having trouble to have it find the Google Protocol Buffers binary
> and libraries in a specific directory in my workspace.
>
>
>
> Due to several reasons, we cannot install protobuffers directly in our
> environment, so I have it download and unpack a zip file with the
> protobuffer library and header files in a directory in my home folder.
> However, when I use the find_package directive giving said folder as a hint
> it complains that it could not find a protobuf-config.cmake file and fails.
> I couldn't find any such file anywhere, the only thing coming close is a "
> protobuf-config.cmake.in" in the protobuf source tree and I don't know if
> I can use that.
>
>
>
> Do I have to provide my own protobuf-config.cmake file, or I'm using it
> completely wrong?
>
>
>
> We are frozen in protocol buffers 2.4.1. I guess we can upgrade to 2.7.0,
> but we can't use 3.0.x.
>
>
>
> Thanks,
>
> Homero.
>
-- 

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_INCLUDE_CURRENT_DIR on a function

2016-10-25 Thread Craig Scott
Thinking about this some more, I suspect Petr's comments may be on the
right track. What matters is the value of this variable in the scope of the
*directory* being processed. You need the CMAKE_INCLUDE_CURRENT_DIR
variable to be set in that directory scope, if I'm understanding the docs
correctly. If you create an executable target inside the function, I would
hazard a guess that it is that directory scope's variable that will be
consulted to determine whether to include the current source and binary
dirs in the include path.

To be honest, when I've used the automoc feature in the past, I've always
set this variable directly in the CMakeLists.txt file where I want it to
apply, never inside a function. This has always Just Worked for me. If you
really want to get those two paths included in the search path without
having to rely on CMAKE_INCLUDE_CURRENT_DIR being set in the directory
scope, you can always just add them manually to your target inside the
function. For example:

function(AddTest)
...
add_executable(${FILE_RAW} ${TEST_FILE})
target_include_directories(${FILE_RAW} PRIVATE
"${CMAKE_CURRENT_BINARY_DIR}"
"${CMAKE_CURRENT_SOURCE_DIR}"
)
...
endfunction()

Pretty sure that would work and it avoids the whole question of where
CMAKE_INCLUDE_CURRENT_DIR needs to be set. One could also argue that it
makes your function more self-contained with fewer side effects.


On Tue, Oct 25, 2016 at 4:20 PM, Petr Kmoch  wrote:

> Hi Tiago.
>
> Yes, Craig's original comment applies. Targets do not have scope,
> variables do. Because you're in a function, you'd need to set the variable
> using PARENT_SCOPE to have it apply outside the function:
>
> function(AddTest)
>   #...
>   set(CMAKE_INCLUDE_CURRENT_DIR ON PARENT_SCOPE)
>   #...
> endfunction()
>
> Note that this will only help if the funciton is called directly; if
> called from another function, it will fail again (since the variable would
> just be set in the calling function's scope and not at global level).
>
> However, taking a step back, I believe setting the variable doesn't belong
> into the `AddTest` function at all. Looking at it, it seems to be concerned
> with creating and setting up one target. IMO, such a function should not
> also modify global state. Do not forget that CMAKE_INCLUDE_CURRENT_DIR is
> not target-specific in any way; it affects *all* targets in the current
> directory.
>
> Therefore, my suggestion would be to move setting it out of the function
> altogether and perform it at CMakeList scope. Alternatively, put the
> function's declaration into a separate CMake file, along with the set()
> command. Then, whoever wants to use the function has to include() that
> file, which will also cause them to have CMAKE_INCLUDE_CURRENT_DIR set
> accordingly.
>
> Petr
>
>
> On 25 October 2016 at 00:55, Tiago Macarios 
> wrote:
>
>> Hi Craig,
>>
>> Maybe my problem description was lacking. Below is the function I have.
>> Both CMAKE_INCLUDE_CURRENT_DIR and the target are defined on the same
>> function scope, but this does not seem to work. I need to define
>> CMAKE_INCLUDE_CURRENT_DIR on the parent CMakeLists file.
>>
>> function(AddTest)
>> set(options)
>> set(oneValueArgs FILE FOLDER)
>> set(multiValueArgs LIBRARIES)
>> cmake_parse_arguments(TEST
>> "${options}"
>> "${oneValueArgs}"
>> "${multiValueArgs}"
>> ${ARGN}
>> )
>>
>> # THIS DOES NOT WORK HERE I NEED TO SET IT IN THE PARENT FOLDER
>> set(CMAKE_INCLUDE_CURRENT_DIR ON)
>>
>> get_filename_component(FILE_RAW ${TEST_FILE} NAME_WE)
>> add_executable(${FILE_RAW} ${TEST_FILE})
>>
>> set_target_properties(${FILE_RAW}
>> PROPERTIES
>> CXX_STANDARD 14
>> CXX_EXTENSIONS OFF
>> AUTOMOC ON
>> AUTOUIC ON
>> FOLDER ${TEST_FOLDER}
>> )
>>
>> find_package(Qt5Test)
>> target_link_libraries(${FILE_RAW} ${TEST_LIBRARIES})
>>
>> add_test(NAME ${FILE_RAW} COMMAND ${FILE_RAW})
>> endfunction()
>>
>>
>>
>>
>>
>>
>>
>>
>>
>>
>>
>> On Mon, Oct 24, 2016 at 3:48 PM, Craig Scott 
>> wrote:
>>
>>> function() introduces a new scope, so if you want changes you make to
>>> variables inside the function to be visible outside the function, you need
>>> to use set(... PARENT_SCOPE). Alternatively, a macro() does not introduce a
>>> new scope, so replacing your function() with a macro() may also yield the
>>> behaviour you want (but changing to a macro has other effects, so make sure
>>> you read the docs before going down that path). Also note that setting it
>>> in one directory does not make it apply to subdirectories as well, in case
>>> that matters in your situation.
>>>
>>>
>>>
>>> On Tue, Oct 25, 2016 at 9:42 AM, Tiago Macarios >> > wrote:
>>>
 Hi,

 Does CMAKE_INCLUDE_CURRENT_DIR need to be set outside of a function?

 I have