[cmake-developers] CPack IFW generator
Hi Nils, and other developers! 15.07.2014, 01:21, Nils Gladitz nilsglad...@gmail.com: Hello again :) Some stuff that remains from my earlier observations: - A Lot of commented out code that should be removed. I do this work sometimes Is Unescaped XML content from CMake variables. Now I use cmXMLSafe in several places Some other random stuff I noticed: - CPACK_IFW_BINARYCREATOR_EXECUTABLE_FOUND seems redundant given that find_program() already encodes this in the cache variable. I think you're right and I'll get rid of this variable in the near future. But as long as the variable is still alive. - In the CMake coding conventions class members start uppercase. The names of the methods I write with a capital letter, but the property names with a small letter as in the base class cmCpackGenerator. I tried building a CMake installer with the generator again but it failed with: Caught exception: Component version for '/home/ngladitz/src/git/cpackifwgenerator/build/_CPack_Packages/Linux-x86_64/IFW/cmake-3.0.20140709-gd078a-Linux-x86_64/packages/CMake/meta/package.xml' is invalid! Version3.0.20140709-gd078a/Version Now I fixed it. Should work. Regards -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
[cmake-developers] CPack IFW генератор
Hello fans of CMake and Windows! I want to present the online installer CMake for 32-bit and 64-bit versions of Windows. And immediately the binaries: http://ifw.podsvirov.pro/cmake/cmake-master-windows-32bit-online.exe http://ifw.podsvirov.pro/cmake/cmake-master-windows-64bit-online.exe The installer will install CMake from an online repository and create shortcuts in the start menu. The composition of the labels is the same as that of the NSIS installer. But there is a difference: the Uninstaller allows not only to delete it may update CMake. The content of the installed package matches the 'master' branch source code + the CPack IFW generator. CMake well done: he build and package himself :-) I don't promise daily updates, but once a week I'll try to put a fresh build. 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-developers
[cmake-developers] CPack IFW generator
17.07.2014, 12:04, Konstantin Podsvirov konstan...@podsvirov.pro: Hello fans of CMake and Windows! I want to present the online installer CMake for 32-bit and 64-bit versions of Windows. All well and good, but the title of the previous writing containing Russian characters. Sorry :-) just Russian is my native language. It was a typo. The installers I presented are test and may contain errors. If you have questions or suggestions, please write to the list or to me personally. 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-developers
[cmake-developers] [CMake 0015028]: CMake build error on QNX
The following issue has been SUBMITTED. == http://public.kitware.com/Bug/view.php?id=15028 == Reported By:Bob E. Assigned To: == Project:CMake Issue ID: 15028 Category: CMake Reproducibility:always Severity: minor Priority: high Status: new == Date Submitted: 2014-07-17 06:23 EDT Last Modified: 2014-07-17 06:23 EDT == Summary:CMake build error on QNX Description: cmake-2.8.12.2/Source/kwsys/SystemInformation.cxx:3682: error: 'SA_RESTART' was not declared in this scope cc: /usr/qnx650/host/qnx6/x86/usr/lib/gcc/i486-pc-nto-qnx6.5.0/4.4.2/cc1plus error 1 make[2]: *** [Source/kwsys/CMakeFiles/cmsys.dir/SystemInformation.cxx.o] Error 1 Steps to Reproduce: Make Cmake from sources. Additional Information: QNX not support SA_RESTART signal: qnx6\usr\include\signal.h /* #define SA_RESTART 0x0040 (not supported yet) *//* Restart the kernel call on signal return */ In ProcessUNIX.c this error was resolved earlier. Patch correct it in SystemInformation.cxx == Issue History Date ModifiedUsername FieldChange == 2014-07-17 06:23 Bob E. New Issue 2014-07-17 06:23 Bob E. File Added: SystemInformation.cxx.QNX.path == -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [cmake-developers] [Review Request] Topic CMakePackageConfigHelpers_build_tree
On 07/16/2014 11:55 AM, Daniele E. Domenichelli wrote: Please review the topic CMakePackageConfigHelpers_build_tree. This patch adds an option BUILD_TREE to configure_package_config_file. The changes look good to me, though I'd appreciate feedback from others who have worked on this module before. In the documentation formatting commit, I see blocks like: +# .. command:: configure_package_config_file +# +# Create a config file for a project:: The definition of the command should be in an indented block so that reST knows it is part of the explicit markup block. Thanks, -Brad -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [CMake] Fails for Solaris
Hi Amos, Although I'm ure it's *possible*, I'd be surprised if changing the compiler made any difference. A few questions would help narrow down the issue: - Which source are you building from? Is it the 3.0.0 release tgz or is it a particular git hash? - Are you doing an in-source build (not recommended) or an out-of-source build (recommended)? - What's the exact build command you're using? Thanks - Chuck On Wed, Jul 16, 2014 at 7:37 PM, Amos a.go...@gmail.com wrote: Thanks for the reply. I tried with both gcc-4.8.3 and Studio 12.1. Maybe I'll try updating SolarisStudio. On Wed, Jul 16, 2014 at 10:20 AM, Chuck Atkins chuck.atk...@kitware.com wrote: Amos, I just tried on a Sun Blade 1500 running Solaris 10 8/11 with an UltraSPARC IIIi using SolarisStudio 12.2 and 12.3. Both were able to configure and build successfully using both the bootstrap, /path/to/source/bootstrap gmake, and and cmake, cmake /path/to/source gmake, so it can be done: - CMake 3.0.0, Copyright 2000-2014 Kitware, Inc. C compiler on this system is: /opt/solarisstudio12.3/bin/suncc C++ compiler on this system is: /opt/solarisstudio12.3/bin/sunCC Makefile processor on this system is: gmake /opt/solarisstudio12.3/bin/sunCC is not GNU compiler ... /opt/solarisstudio12.3/bin/sunCC has ANSI for scoping - gmake: `cmake' is up to date. loading initial cache file /export/home/local/KHQ/chuck.atkins/Code/CMake/build/v3.0.0/sunpro_bootstrap/Bootstrap.cmk/InitialCacheFlags.cmake -- Configuring done -- Generating done -- Build files have been written to: /export/home/local/KHQ/chuck.atkins/Code/CMake/build/v3.0.0/sunpro_bootstrap - CMake has bootstrapped. Now run gmake. That being said however, this is clearly not working for you. What particular versions of compilers and Solaris are you using? Are you using the 3.0.0 tarball or are you using a git checkout of a specific hash? - Chuck On Tue, Jul 15, 2014 at 1:06 PM, Amos a.go...@gmail.com wrote: No matter if I use GNU or workshop compilers, the initial config fails: CC supports member templates CC has standard template specialization syntax CC has argument dependent lookup CC has struct stat with st_mtim member CC has ios::binary openmode CC has ANSI for scoping - gmake: 'cmake' is up to date. loading initial cache file /usr/soft/that/cmake-3.0.0/src/default/sparcv9_sun_solaris2.10/Bootstrap.cmk/InitialCacheFlags.cmake -- Using system-installed BZIP2 -- Using system-installed ZLIB CMake Error: File /usr/soft/that/cmake-3.0.0/src/default/sparcv9_sun_solaris2.10/Tests/.NoDartCoverage does not exist. CMake Error at CMakeLists.txt:161 (configure_file): configure_file Problem configuring file Call Stack (most recent call first): CMakeLists.txt:527 (CMAKE_SETUP_TESTING) -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake
[CMake] Adding custom environment variables to generated Makefile
Hello, We are migrating our project from standard Unix Makefiles to CMake. The old Makefile contained a line that cleared an environment variable like this: export CPLUS_INCLUDE_PATH= This step is necessary due to some library/path confusion in combination with 3rd party libraries on some systems. However, I was unable to find a way to generate such a command (or any other way to define environment variables) inside the generated Makefile. The closest I got was something like add_custom_target( workaround sed -i '3in\#Workaround\ for\ Thrust\ bug\\nexport\ CPLUS_INCLUDE_PATH=' Makefile ) This kind of works, but you have to run make workaround each time after generating the Makefile (and if you forget to do it, the build will fail later) Other projects [1] that use CMake just tell their users to run unset CPLUS_INCLUDE_PATH in their shell to work around the issue, which I try to avoid. Is there any automated way to do this when generating the Makefile? [1] http://www.libama.org/documentation.html?tx_restdoc_pi1[doc]=installation|configuration|cuda -- 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] About the FindCUDA.cmake module ande Separate Compilation
Dear All
I am a user of cmake build system and its differents modules, that
were very helpful in the past.
But I met some specific issues with the FindCUDA.cmake module, for
about a year now. Especially about the Separate Compilation feature,
that never worked for me, I previously had to bypass the problem by
rewriting some code in the same file, but today I am stuck and I have
to get this feature working.
What are my files ?
I have
===
a.cu:
__constant__ Buffer float[1024];
__global__ void kernelA( float a )
{
Buffer[0] = a;
}
===
b.cu.h
extern __constant__ Buffer float[1024];
===
b.cu
__global__ void kernelB( float b )
{
Buffer[0] += b;
}
===
It is obvious with this configuration, that I have to link b.cu with
a.cu, in order to get the same memory area shared across them. This
simple feature seems to be only available if a separate compilation
configuration build is used, in order to avoid redefinition error, and
also compiler needs relocatable device code to be setted, this latter
I don't really understand why.
What specific feature of the CMake Module I am using ?
Here are the main macros I am using:
===
list(APPEND CUDA_NVCC_FLAGS -gencode arch=compute_30,code=sm_30 -rdc=true )
set( CUDA_SEPARABLE_COMPILATION )
cuda_add_executable(${OUTPUT_NAME} ${sources} ${headers})
==
The error I get:
If I discard the -rdc=true nvcc option for relocatable code, the
code compiles, and links fine, but at runtime the code does not work
as expected, ie the value inside the buffer is not shared across
differents kernel a and b.
If all options stated before are setted, the code compiles fine, but
at link step I get tons of link errors that looks like:
undefined reference to `__cudaRegisterLinkedBinary[...]'
The problem doesn't seem that hard to solve, as seperate compilation
is extensively explained in the cuda documentation :
http://docs.nvidia.com/cuda/cuda-compiler-driver-nvcc/index.html#using-separate-compilation-in-cuda
But I still got problems trying to get the separate things to work
with FindCUDA.cmake.
Thank you in advance for any help.
--
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] RPM packaging dependencies expressed in subdirectories
Thank you again Nils for the guidelines, now its time to experiment :).
Thibault
On Wed, Jul 16, 2014 at 5:40 PM, Nils Gladitz nilsglad...@gmail.com wrote:
On 16.07.2014 16:37, Thibault Hild wrote:
Thanks Nils for the hint.
I guess you had to use Cmake constructs like:
if(new dep MATCHES a regex built with ${pack_deps})
in order to decide whether a new dependency is allowed.
As I am quite new to CMake functions, can you detail a bit how do you
operate such validation ?
I got the current list of dependencies with get_property().
Then I looped over the list with foreach().
Every list item I split into name and version (with regex) and then
compared it to the new dependency.
I used message(FATAL_ERROR) to issue a (fatal) diagnostic if a different
version of a dependency has already been requested.
Is there some sort of function repository to share these custom CMake
function tools ?
I am not aware of any except for cmake's own module repository[1] ...
which might not be the right place for this though.
Perhaps the Wiki.
Nils
[1] http://www.cmake.org/cmake/help/v3.0/manual/cmake-modules.7.html
--
Powered by www.kitware.com
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Kitware offers various services to support the CMake community. For more
information on each offering, please visit:
CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake
[CMake] find_package and INTERFACE targets in 3.0
Hi list! I'm a big fan of the new INTERFACE targets target usage requirements, but none of the provided Findpackage.cmake files seem to take advantage of the new paradigm. Checking the wiki, the old Findpackage.cmake seem to be deprecated, with most of the information on authoring new packages assuming that you are the developer of the module, not the consumer. What is the recommended way to deal with packages that don't provide these config files? I'll happily write my own Findpackage.cmake files, however that approach seems deprecated and I haven't found any good examples of find modules that define IMPORT or INTERFACE targets instead of the older method of setting a bunch of package_xxx variables. -Walter -- 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] Target usage requirements for shared libraries
Hi there! I've got a question I can't seem to find a good answer to: What is the idiomatic way in CMake 3.0 to handle bundling shared libraries? I've exhausted my google-fu and all of the examples seem to be from before CMake 3 was released. None of them take any advantage of 3.0's new and IMO much more elegant target usage requirements paradigm, and there doesn't really seem to be consensus on what the best way to handle this problem is. Given some application app and some library upstreamlib with a header, static, and shared library components (.h, .lib, and .dll on windows), it seems like there should be some way to write a definition for an interface library such that by writing target_link_library(app upstreamlib), the appropriate shared libraries are copied to the exe directory (or in some way made accessible) either via a special custom target, a post build step, or install time. Static libraries and headers are handled this way, so why not shared libraries too? Am I just being naive? Thanks for your help. -Walter -- 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.0.0-4322-g3ac03fb
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 3ac03fb1e3a9634721101e4b4566b37daa9929b7 (commit)
via 727ab63ca8f9b174e11630b11a373b5837da0b75 (commit)
from f1e74a6f0351650fd7108f34e8f63bb8f1e4ab6d (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3ac03fb1e3a9634721101e4b4566b37daa9929b7
commit 3ac03fb1e3a9634721101e4b4566b37daa9929b7
Merge: f1e74a6 727ab63
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Jul 17 08:18:19 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jul 17 08:18:19 2014 -0400
Merge topic 'fix_Xcode_generator_name' into next
727ab63c Revert Tests: Xcode = 3 passes SubDirSpaces
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=727ab63ca8f9b174e11630b11a373b5837da0b75
commit 727ab63ca8f9b174e11630b11a373b5837da0b75
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Jul 17 08:19:08 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Thu Jul 17 08:19:20 2014 -0400
Revert Tests: Xcode = 3 passes SubDirSpaces
This reverts commit 2427f523f629ee82847bc934be2cd6c6f1074560.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 90cc9ef..ca7fcdc 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1502,8 +1502,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P
${CMake_SOURCE_DIR}/Utilities/Release
)
endif()
- if(MAKE_SUPPORTS_SPACES AND
- NOT (CMAKE_GENERATOR STREQUAL Xcode AND XCODE_VERSION VERSION_LESS 3))
+ if(MAKE_SUPPORTS_SPACES AND NOT CMAKE_GENERATOR STREQUAL Xcode)
add_test(SubDirSpaces ${CMAKE_CTEST_COMMAND}
--build-and-test
${CMake_SOURCE_DIR}/Tests/SubDirSpaces
---
Summary of changes:
Tests/CMakeLists.txt |3 +--
1 file changed, 1 insertion(+), 2 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.0.0-4324-gd913fb3
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 d913fb3da353c0e9b2424a1bd358b9f8b2082315 (commit)
via e58594a8a94531682b4fbba4f8df3473f77529af (commit)
from 3ac03fb1e3a9634721101e4b4566b37daa9929b7 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d913fb3da353c0e9b2424a1bd358b9f8b2082315
commit d913fb3da353c0e9b2424a1bd358b9f8b2082315
Merge: 3ac03fb e58594a
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Jul 17 08:40:01 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jul 17 08:40:01 2014 -0400
Merge topic 'fix-QCC-compile-flags' into next
e58594a8 QNX: Split Platform and Compiler information modules
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e58594a8a94531682b4fbba4f8df3473f77529af
commit e58594a8a94531682b4fbba4f8df3473f77529af
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Jul 17 08:33:08 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Thu Jul 17 08:35:10 2014 -0400
QNX: Split Platform and Compiler information modules
Move QCC-specific information into Compiler/QCC modules.
diff --git a/Modules/Compiler/QCC-C.cmake b/Modules/Compiler/QCC-C.cmake
new file mode 100644
index 000..ae4a2f4
--- /dev/null
+++ b/Modules/Compiler/QCC-C.cmake
@@ -0,0 +1,2 @@
+include(Compiler/QCC)
+__compiler_qcc(C)
diff --git a/Modules/Compiler/QCC-CXX.cmake b/Modules/Compiler/QCC-CXX.cmake
new file mode 100644
index 000..a676bbe
--- /dev/null
+++ b/Modules/Compiler/QCC-CXX.cmake
@@ -0,0 +1,12 @@
+include(Compiler/QCC)
+__compiler_qcc(CXX)
+
+# If the toolchain uses qcc for CMAKE_CXX_COMPILER instead of QCC, the
+# default for the driver is not c++.
+set(CMAKE_CXX_COMPILE_OBJECT
+ CMAKE_CXX_COMPILER -lang-c++ DEFINES FLAGS -o OBJECT -c SOURCE)
+
+set(CMAKE_CXX_LINK_EXECUTABLE
+ CMAKE_CXX_COMPILER -lang-c++ FLAGS CMAKE_CXX_LINK_FLAGS LINK_FLAGS
OBJECTS -o TARGET LINK_LIBRARIES)
+
+set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN
-fvisibility-inlines-hidden)
diff --git a/Modules/Compiler/QCC.cmake b/Modules/Compiler/QCC.cmake
new file mode 100644
index 000..76477e4
--- /dev/null
+++ b/Modules/Compiler/QCC.cmake
@@ -0,0 +1,24 @@
+
+#=
+# Copyright 2002-2014 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the License);
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=
+# (To distribute this file outside of CMake, substitute the full
+# License text for the above reference.)
+include(Compiler/GNU)
+
+macro(__compiler_qcc lang)
+ __compiler_gnu(${lang})
+
+ #
http://www.qnx.com/developers/docs/6.4.0/neutrino/utilities/q/qcc.html#examples
+ set(CMAKE_${lang}_COMPILE_OPTIONS_TARGET -V)
+
+ set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} -Wp,-isystem,)
+ set(CMAKE_DEPFILE_FLAGS_${lang}
-Wc,-MMD,DEPFILE,-MT,OBJECT,-MF,DEPFILE)
+endmacro()
diff --git a/Modules/Platform/QNX-QCC-C.cmake b/Modules/Platform/QNX-QCC-C.cmake
deleted file mode 100644
index e5721a7..000
--- a/Modules/Platform/QNX-QCC-C.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-
-include(Platform/QNX)
-
-__compiler_qcc(C)
diff --git a/Modules/Platform/QNX-QCC-CXX.cmake
b/Modules/Platform/QNX-QCC-CXX.cmake
deleted file mode 100644
index e490bbe..000
--- a/Modules/Platform/QNX-QCC-CXX.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-
-include(Platform/QNX)
-
-__compiler_qcc(CXX)
diff --git a/Modules/Platform/QNX.cmake b/Modules/Platform/QNX.cmake
index ce7eb8a..ebc4609 100644
--- a/Modules/Platform/QNX.cmake
+++ b/Modules/Platform/QNX.cmake
@@ -1,5 +1,8 @@
set(QNXNTO 1)
+include(Platform/GNU)
+unset(CMAKE_LIBRARY_ARCHITECTURE_REGEX)
+
set(CMAKE_DL_LIBS )
# Shared libraries with no builtin soname may not be linked safely by
@@ -14,39 +17,3 @@ foreach(type SHARED_LIBRARY SHARED_MODULE EXE)
set(CMAKE_${type}_LINK_STATIC_C_FLAGS -Wl,-Bstatic)
set(CMAKE_${type}_LINK_DYNAMIC_C_FLAGS -Wl,-Bdynamic)
endforeach()
-
-include(Platform/GNU)
-unset(CMAKE_LIBRARY_ARCHITECTURE_REGEX)
-
-macro(__compiler_qcc lang)
- #
http://www.qnx.com/developers/docs/6.4.0/neutrino/utilities/q/qcc.html#examples
- set(CMAKE_${lang}_COMPILE_OPTIONS_TARGET -V)
-
- set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} -Wp,-isystem,)
- set(CMAKE_DEPFILE_FLAGS_${lang}
-Wc,-MMD,DEPFILE,-MT,OBJECT,-MF,DEPFILE)
-
-
[Cmake-commits] CMake branch, next, updated. v3.0.0-4327-g90d9a5d
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 90d9a5d367cf433b8431aedbe08604284efb9a9a (commit)
via 511213e24af5a639920dc94fd7df1f3d24176a88 (commit)
via fe0c29487b890e5f3f7f7196ee1b2cf4d5f27397 (commit)
from d913fb3da353c0e9b2424a1bd358b9f8b2082315 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=90d9a5d367cf433b8431aedbe08604284efb9a9a
commit 90d9a5d367cf433b8431aedbe08604284efb9a9a
Merge: d913fb3 511213e
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Thu Jul 17 09:27:40 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jul 17 09:27:40 2014 -0400
Merge topic 'dev/target-fastpaths' into next
511213e2 fixup! cmTarget: Use static strings for special property names
fe0c2948 fixup! cmTarget: Fast path for regular properties
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=511213e24af5a639920dc94fd7df1f3d24176a88
commit 511213e24af5a639920dc94fd7df1f3d24176a88
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Thu Jul 17 09:25:49 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Thu Jul 17 09:25:49 2014 -0400
fixup! cmTarget: Use static strings for special property names
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 7479133..843761f 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -5076,7 +5076,7 @@ PropertyType checkInterfacePropertyCompatibility(cmTarget
const* tgt,
CompatibleType t,
PropertyType *)
{
- PropertyType propContent = getTypedPropertyPropertyType(tgt, p.c_str(),
+ PropertyType propContent = getTypedPropertyPropertyType(tgt, p,
0);
const bool explicitlySet = tgt-GetProperties()
.find(p)
@@ -5130,7 +5130,7 @@ PropertyType checkInterfacePropertyCompatibility(cmTarget
const* tgt,
!= theTarget-GetProperties().end();
PropertyType ifacePropContent =
getTypedPropertyPropertyType(theTarget,
- interfaceProperty.c_str(), 0);
+ interfaceProperty, 0);
std::string reportEntry;
if (ifaceIsSet)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fe0c29487b890e5f3f7f7196ee1b2cf4d5f27397
commit fe0c29487b890e5f3f7f7196ee1b2cf4d5f27397
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Thu Jul 17 09:21:19 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Thu Jul 17 09:21:19 2014 -0400
fixup! cmTarget: Fast path for regular properties
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index a203a7f..7479133 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -3260,12 +3260,12 @@ const char *cmTarget::GetProperty(const std::string
prop,
}
if (!noMessage)
{
- e Target \ this-Name \ contains $TARGET_OBJECTS
- generator expression in its sources list. This content was not
- previously part of the SOURCES property when that property was
- read at configure time. Code reading that property needs to be
- adapted to ignore the generator expression using the
- string(GENEX_STRIP) command.;
+ e Target \ this-Name \ contains
+ $TARGET_OBJECTS generator expression in its sources list.
+ This content was not previously part of the SOURCES property
+ when that property was read at configure time. Code reading
+ that property needs to be adapted to ignore the generator
+ expression using the string(GENEX_STRIP) command.;
context-IssueMessage(messageType, e.str());
}
if (addContent)
---
Summary of changes:
Source/cmTarget.cxx | 16
1 file changed, 8 insertions(+), 8 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.0.0-4329-g6f9ed3e
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 6f9ed3e5b7b9b97b58af9464d927bbda55dea6b4 (commit)
via 3526478cc093f1fc6c1887e1059f337fb7086cc7 (commit)
from 90d9a5d367cf433b8431aedbe08604284efb9a9a (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6f9ed3e5b7b9b97b58af9464d927bbda55dea6b4
commit 6f9ed3e5b7b9b97b58af9464d927bbda55dea6b4
Merge: 90d9a5d 3526478
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Jul 17 09:31:07 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jul 17 09:31:07 2014 -0400
Merge topic 'fix_Xcode_generator_name' into next
3526478c Tests: Activate tests accidentally excluded from Xcode
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3526478cc093f1fc6c1887e1059f337fb7086cc7
commit 3526478cc093f1fc6c1887e1059f337fb7086cc7
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Jul 17 09:31:53 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Thu Jul 17 09:31:53 2014 -0400
Tests: Activate tests accidentally excluded from Xcode
The generator name is Xcode, not XCode. Fix this typo. Explicitly
exclude the SubDirSpaces test on Xcode because it does not work. Also
tell the RunCMake.File_Generate test when Xcode is not multi-config so
it can exlcude the OutputConflict case.
Inspired-by: Daniele E. Domenichelli daniele.domeniche...@iit.it
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index dc4f894..ca7fcdc 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -77,7 +77,7 @@ if(BUILD_TESTING)
# some old versions of make simply cannot handle spaces in paths
if (MAKE_IS_GNU OR
CMAKE_MAKE_PROGRAM MATCHES nmake|gmake|wmake OR
- CMAKE_GENERATOR MATCHES Visual Studio|XCode|Borland)
+ CMAKE_GENERATOR MATCHES Visual Studio|Xcode|Borland)
set(MAKE_SUPPORTS_SPACES 1)
else()
set(MAKE_SUPPORTS_SPACES 0)
@@ -1502,7 +1502,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P
${CMake_SOURCE_DIR}/Utilities/Release
)
endif()
- if(MAKE_SUPPORTS_SPACES)
+ if(MAKE_SUPPORTS_SPACES AND NOT CMAKE_GENERATOR STREQUAL Xcode)
add_test(SubDirSpaces ${CMAKE_CTEST_COMMAND}
--build-and-test
${CMake_SOURCE_DIR}/Tests/SubDirSpaces
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 06272ce..ff3b9a0 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -18,6 +18,7 @@ endif()
if(XCODE_VERSION AND ${XCODE_VERSION} VERSION_LESS 2)
set(TargetSources_ARGS -DXCODE_BELOW_2=1)
+ set(File_Generate_ARGS -DXCODE_BELOW_2=1)
endif()
add_RunCMake_test(CMP0019)
diff --git a/Tests/RunCMake/File_Generate/RunCMakeTest.cmake
b/Tests/RunCMake/File_Generate/RunCMakeTest.cmake
index f74d17e..dee0692 100644
--- a/Tests/RunCMake/File_Generate/RunCMakeTest.cmake
+++ b/Tests/RunCMake/File_Generate/RunCMakeTest.cmake
@@ -1,8 +1,8 @@
include(RunCMake)
run_cmake(CommandConflict)
-if(${RunCMake_GENERATOR} MATCHES Visual Studio OR ${RunCMake_GENERATOR}
MATCHES XCode )
-run_cmake(OutputConflict)
+if(${RunCMake_GENERATOR} MATCHES Visual Studio|Xcode AND NOT XCODE_BELOW_2)
+ run_cmake(OutputConflict)
endif()
run_cmake(EmptyCondition1)
run_cmake(EmptyCondition2)
---
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.0.0-4331-gc7244c6
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 c7244c6b863d3a670e8aa0a032173cf334556be9 (commit)
via 3151024d241c581463d20bf0ce3d1060bdd22de4 (commit)
from 6f9ed3e5b7b9b97b58af9464d927bbda55dea6b4 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c7244c6b863d3a670e8aa0a032173cf334556be9
commit c7244c6b863d3a670e8aa0a032173cf334556be9
Merge: 6f9ed3e 3151024
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Jul 17 09:35:53 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jul 17 09:35:53 2014 -0400
Merge topic 'fix-QCC-compile-flags' into next
3151024d QNX: Add missing flags for configurations and artifact creation.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3151024d241c581463d20bf0ce3d1060bdd22de4
commit 3151024d241c581463d20bf0ce3d1060bdd22de4
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Jul 15 11:01:36 2014 +0200
Commit: Brad King brad.k...@kitware.com
CommitDate: Thu Jul 17 09:36:18 2014 -0400
QNX: Add missing flags for configurations and artifact creation.
Commit v3.0.0-rc1~111^2 (QNX: Introduce QCC compiler id for that
QNX platform compiler., 2014-01-20) split handling of the QNX QCC
compiler into a separate compiler-id. That refactoring results in
the QCC compiler not using the CMake-compiler-id GNU, which means
that the __compiler_gnu macro is no longer executed for it.
Add Compiler/QCC*.cmake modules to define and call the __compiler_qcc
macro and teach it to call __compiler_gnu internally. Remove the
corresponding pieces from the Platform/QNX*.cmake modules.
It is also necessary to change the language conditional to dereference
the lang macro parameter, which is another bug introduced by the
same commit. The extra -lang-c++ flag is only necessary when the CXX
compiler is specified as 'qcc' instead of 'QCC' in the toolchain file,
which is why this bug was not noticed before. The flag is also necessary
in that case when linking in order to find the appropriate standard
libraries. The flag was not previously added when linking executables,
so linking failed even with CMake 2.8.12 with the lower-case compiler-id.
Co-Author: Brad King brad.k...@kitware.com
diff --git a/Modules/Compiler/QCC-C.cmake b/Modules/Compiler/QCC-C.cmake
new file mode 100644
index 000..ae4a2f4
--- /dev/null
+++ b/Modules/Compiler/QCC-C.cmake
@@ -0,0 +1,2 @@
+include(Compiler/QCC)
+__compiler_qcc(C)
diff --git a/Modules/Compiler/QCC-CXX.cmake b/Modules/Compiler/QCC-CXX.cmake
new file mode 100644
index 000..a676bbe
--- /dev/null
+++ b/Modules/Compiler/QCC-CXX.cmake
@@ -0,0 +1,12 @@
+include(Compiler/QCC)
+__compiler_qcc(CXX)
+
+# If the toolchain uses qcc for CMAKE_CXX_COMPILER instead of QCC, the
+# default for the driver is not c++.
+set(CMAKE_CXX_COMPILE_OBJECT
+ CMAKE_CXX_COMPILER -lang-c++ DEFINES FLAGS -o OBJECT -c SOURCE)
+
+set(CMAKE_CXX_LINK_EXECUTABLE
+ CMAKE_CXX_COMPILER -lang-c++ FLAGS CMAKE_CXX_LINK_FLAGS LINK_FLAGS
OBJECTS -o TARGET LINK_LIBRARIES)
+
+set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN
-fvisibility-inlines-hidden)
diff --git a/Modules/Compiler/QCC.cmake b/Modules/Compiler/QCC.cmake
new file mode 100644
index 000..76477e4
--- /dev/null
+++ b/Modules/Compiler/QCC.cmake
@@ -0,0 +1,24 @@
+
+#=
+# Copyright 2002-2014 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the License);
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=
+# (To distribute this file outside of CMake, substitute the full
+# License text for the above reference.)
+include(Compiler/GNU)
+
+macro(__compiler_qcc lang)
+ __compiler_gnu(${lang})
+
+ #
http://www.qnx.com/developers/docs/6.4.0/neutrino/utilities/q/qcc.html#examples
+ set(CMAKE_${lang}_COMPILE_OPTIONS_TARGET -V)
+
+ set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} -Wp,-isystem,)
+ set(CMAKE_DEPFILE_FLAGS_${lang}
-Wc,-MMD,DEPFILE,-MT,OBJECT,-MF,DEPFILE)
+endmacro()
diff --git a/Modules/Platform/QNX-QCC-C.cmake b/Modules/Platform/QNX-QCC-C.cmake
deleted file mode 100644
index e5721a7..000
--- a/Modules/Platform/QNX-QCC-C.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-
-include(Platform/QNX)
-
-__compiler_qcc(C)
diff
[Cmake-commits] CMake branch, next, updated. v3.0.0-4333-g5368f21
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 5368f212a9c27cbd8eaed20d9c580459fb258104 (commit) via fd63722dc86ec30e8a6f543881d56b3c473da34d (commit) from c7244c6b863d3a670e8aa0a032173cf334556be9 (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5368f212a9c27cbd8eaed20d9c580459fb258104 commit 5368f212a9c27cbd8eaed20d9c580459fb258104 Merge: c7244c6 fd63722 Author: Brad King brad.k...@kitware.com AuthorDate: Thu Jul 17 09:41:59 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Thu Jul 17 09:41:59 2014 -0400 Merge topic 'compile-with-cray' into next fd63722d cmcurl: Fix a build failure with the Cray compiler on Linux (#15026) http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fd63722dc86ec30e8a6f543881d56b3c473da34d commit fd63722dc86ec30e8a6f543881d56b3c473da34d Author: Chuck Atkins chuck.atk...@kitware.com AuthorDate: Wed Jul 16 09:04:42 2014 -0500 Commit: Brad King brad.k...@kitware.com CommitDate: Thu Jul 17 09:43:05 2014 -0400 cmcurl: Fix a build failure with the Cray compiler on Linux (#15026) The error is caused by a workaround for UNICOS. The workaround incorrectly uses the _CRAYC macro to determine if building for UNICOS. This macro will always be defined for the Cray C and C++ compiler regardless of the target platform, even when building for Linux. The correct macro should be _CRAY, which as per Cray documentation is only defined for UNICOS targeted builds. diff --git a/Utilities/cmcurl/hostip.c b/Utilities/cmcurl/hostip.c index fd555ef..83f1564 100644 --- a/Utilities/cmcurl/hostip.c +++ b/Utilities/cmcurl/hostip.c @@ -609,7 +609,7 @@ Curl_addrinfo *Curl_ip2addr(in_addr_t num, const char *hostname, int port) h = buf-hostentry; h-h_addr_list = buf-h_addr_list[0]; addrentry = buf-addrentry; -#ifdef _CRAYC +#ifdef _CRAY /* On UNICOS, s_addr is a bit field and for some reason assigning to it * doesn't work. There must be a better fix than this ugly hack. */ --- 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, master, updated. v3.0.0-1418-gbb4c158
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 bb4c1588952523fa8340d6e882c2cb6f3501266b (commit)
via 10c5c82c1e255523757d4c4fe81b6ad742e81c8f (commit)
via 6e7e881c57e8ff7295a1007d329708143b54baad (commit)
via 0400cd5dd1be33ebcc2c2d5dba8233a78b1cee68 (commit)
from 96f2a2a2eddc4f0591abe6b49f5c7a335515f971 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bb4c1588952523fa8340d6e882c2cb6f3501266b
commit bb4c1588952523fa8340d6e882c2cb6f3501266b
Merge: 96f2a2a 10c5c82
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Jul 17 09:43:00 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jul 17 09:43:00 2014 -0400
Merge topic 'generalize-LINK_ONLY'
10c5c82c Help: Add notes for topic 'generalize-LINK_ONLY'
6e7e881c Honor $LINK_ONLY when checking interface properties
0400cd5d Make $LINK_ONLY available to projects (#14751)
---
Summary of changes:
Help/manual/cmake-generator-expressions.7.rst |7 +++
Help/release/dev/generalize-LINK_ONLY.rst |6 ++
Source/cmTarget.cxx| 16
Tests/CompatibleInterface/CMakeLists.txt | 11 ++-
.../CMP0026/empty.cpp = CompatibleInterface/bar.cpp} |2 +-
.../CompatibleInterface/foo.cpp|2 +-
Tests/CompatibleInterface/main.cpp |8 +++-
Tests/InterfaceLinkLibraries/CMakeLists.txt| 12
Tests/InterfaceLinkLibraries/main.cpp |8 ++--
Tests/InterfaceLinkLibraries/zot.cpp |6 ++
Tests/InterfaceLinkLibraries/{bar.h = zot.h} |4 ++--
Tests/InterfaceLinkLibraries/zot_vs6_1.cpp |1 +
Tests/InterfaceLinkLibraries/zot_vs6_2.cpp |1 +
Tests/InterfaceLinkLibraries/zot_vs6_3.cpp |1 +
Tests/InterfaceLinkLibraries/zot_vs6_4.cpp |1 +
15 files changed, 66 insertions(+), 20 deletions(-)
create mode 100644 Help/release/dev/generalize-LINK_ONLY.rst
copy Tests/{RunCMake/CMP0026/empty.cpp = CompatibleInterface/bar.cpp} (83%)
copy Modules/DummyCXXFile.cxx = Tests/CompatibleInterface/foo.cpp (59%)
create mode 100644 Tests/InterfaceLinkLibraries/zot.cpp
copy Tests/InterfaceLinkLibraries/{bar.h = zot.h} (61%)
create mode 100644 Tests/InterfaceLinkLibraries/zot_vs6_1.cpp
create mode 100644 Tests/InterfaceLinkLibraries/zot_vs6_2.cpp
create mode 100644 Tests/InterfaceLinkLibraries/zot_vs6_3.cpp
create mode 100644 Tests/InterfaceLinkLibraries/zot_vs6_4.cpp
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.0.0-1428-ge451094
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 e4510941a3cc5f2990d79242db791bf370bb07d3 (commit) via c45dd669abe746de2e9724044591d70397653d98 (commit) via 89095514a7f6d7075e8d2fda1b88445b87a3bec8 (commit) via 9d72df45057afd955d6bbb7ee2ceb62ab8dc777a (commit) via d5f0743d0f97fb44bcfaafd8680a00631d1c7d40 (commit) via 60bafeb68404dc37434644f56e98000b3b0fff81 (commit) via 8cb9105431bcc4bd206d92b7cd53cebdb1a783bd (commit) via 0a8fbac19a1d12adaa10873cc8fdb3dff164c981 (commit) via fb3518dc81ac1b776503d4369c6d375a706485d1 (commit) via 535fd6ce6d514deebc8c95424df83f73989f55a5 (commit) from bb4c1588952523fa8340d6e882c2cb6f3501266b (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e4510941a3cc5f2990d79242db791bf370bb07d3 commit e4510941a3cc5f2990d79242db791bf370bb07d3 Merge: bb4c158 c45dd66 Author: Brad King brad.k...@kitware.com AuthorDate: Thu Jul 17 09:43:01 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Thu Jul 17 09:43:01 2014 -0400 Merge topic 'refactor-link-internals' c45dd669 cmTarget: Cache compatible interface property sets 89095514 cmTarget: Refactor GetLinkImplementationClosure internals 9d72df45 Genex: Adjust code layout slightly d5f0743d Genex: Refactor empty element strip 60bafeb6 Genex: Avoid repeated search of transitive property whitelist 8cb91054 Genex: Simplify TARGET_PROPERTY transitive lookup 0a8fbac1 cmTarget: Drop GetTransitivePropertyTargets method fb3518dc Refactor system include annotation propagation 535fd6ce cmTarget: Make GetLink*Libraries methods safer to use --- Summary of changes: Source/cmGeneratorExpressionEvaluator.cxx | 161 - Source/cmGeneratorTarget.cxx | 41 ++-- Source/cmTarget.cxx | 141 +++-- Source/cmTarget.h | 51 + 4 files changed, 165 insertions(+), 229 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.0.0-1414-g96f2a2a
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 96f2a2a2eddc4f0591abe6b49f5c7a335515f971 (commit) via fd63722dc86ec30e8a6f543881d56b3c473da34d (commit) from e411b3084241109f98b75ae2d7619eae40ca1e3d (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=96f2a2a2eddc4f0591abe6b49f5c7a335515f971 commit 96f2a2a2eddc4f0591abe6b49f5c7a335515f971 Merge: e411b30 fd63722 Author: Brad King brad.k...@kitware.com AuthorDate: Thu Jul 17 09:42:57 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Thu Jul 17 09:42:57 2014 -0400 Merge topic 'compile-with-cray' fd63722d cmcurl: Fix a build failure with the Cray compiler on Linux (#15026) --- Summary of changes: Utilities/cmcurl/hostip.c |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, next, updated. v3.0.0-4338-gae1c1cf
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 ae1c1cf713b58f9fc88fe4853c7fb8de2f8a8dfe (commit) via e4510941a3cc5f2990d79242db791bf370bb07d3 (commit) via bb4c1588952523fa8340d6e882c2cb6f3501266b (commit) via 96f2a2a2eddc4f0591abe6b49f5c7a335515f971 (commit) via e411b3084241109f98b75ae2d7619eae40ca1e3d (commit) from 5368f212a9c27cbd8eaed20d9c580459fb258104 (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ae1c1cf713b58f9fc88fe4853c7fb8de2f8a8dfe commit ae1c1cf713b58f9fc88fe4853c7fb8de2f8a8dfe Merge: 5368f21 e451094 Author: Brad King brad.k...@kitware.com AuthorDate: Thu Jul 17 09:47:27 2014 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Thu Jul 17 09:47:27 2014 -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, next, updated. v3.0.0-4340-g4d25272
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 4d25272e7e1682b85164434e55fadf06e16e99f8 (commit) via 376ba93588e1dd24cb091c61f9fe635bceaf0a82 (commit) from ae1c1cf713b58f9fc88fe4853c7fb8de2f8a8dfe (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4d25272e7e1682b85164434e55fadf06e16e99f8 commit 4d25272e7e1682b85164434e55fadf06e16e99f8 Merge: ae1c1cf 376ba93 Author: Stephen Kelly steve...@gmail.com AuthorDate: Thu Jul 17 10:06:11 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Thu Jul 17 10:06:11 2014 -0400 Merge topic 'identify-qthelp-artifacts' into next 376ba935 Help: Identify more artifact types in QtHelp documentation. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=376ba93588e1dd24cb091c61f9fe635bceaf0a82 commit 376ba93588e1dd24cb091c61f9fe635bceaf0a82 Author: Stephen Kelly steve...@gmail.com AuthorDate: Wed Jun 18 17:12:53 2014 +0200 Commit: Stephen Kelly steve...@gmail.com CommitDate: Thu Jul 17 16:05:10 2014 +0200 Help: Identify more artifact types in QtHelp documentation. Add identifiers for variables, properties, policies and modules. This will allow QtCreator to show relevant documentation if it learns more about the context of the contents of cmake files. diff --git a/Utilities/Sphinx/create_identifiers.py b/Utilities/Sphinx/create_identifiers.py index 4db7a3f..7715e53 100755 --- a/Utilities/Sphinx/create_identifiers.py +++ b/Utilities/Sphinx/create_identifiers.py @@ -19,13 +19,27 @@ if not lines: newlines = [] for line in lines: - if keyword name=\command\ in line: -if not id=\ in line: - prefix = keyword name=\command\ - part1, part2 = line.split(prefix) - head, tail = part2.split(#command:) - cmdname, rest = tail.split(\) - line = part1 + prefix + id=\command/ + cmdname + \ + part2 + + mapping = ((command, command), + (variable, variable), + (target property, prop_tgt), + (test property, prop_test), + (source file property, prop_sf), + (global property, prop_gbl), + (module, module), + (directory property, prop_dir), + (cache property, prop_cache), + (policy, policy), + (installed file property, prop_inst)) + + for domain_object_string, domain_object_type in mapping: +if keyword name=\ + domain_object_string + \ in line: + if not id=\ in line: +prefix = keyword name=\ + domain_object_string + \ +part1, part2 = line.split(prefix) +head, tail = part2.split(# + domain_object_type + :) +domain_object, rest = tail.split(\) +line = part1 + prefix + id=\ + domain_object_type + / + domain_object + \ + part2 newlines.append(line + \n) f = open(name, w) --- Summary of changes: Utilities/Sphinx/create_identifiers.py | 28 +--- 1 file changed, 21 insertions(+), 7 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.0.0-4342-gbd02742
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 bd0274267f112ce43aa3f34779780026770612bd (commit) via f2fbd3c4f548e7afe4f3ab7b3fa3df2268a954ef (commit) from 4d25272e7e1682b85164434e55fadf06e16e99f8 (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bd0274267f112ce43aa3f34779780026770612bd commit bd0274267f112ce43aa3f34779780026770612bd Merge: 4d25272 f2fbd3c Author: Clinton Stimpson clin...@elemtech.com AuthorDate: Thu Jul 17 10:43:25 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Thu Jul 17 10:43:25 2014 -0400 Merge topic 'encoding-ctest-fixes' into next f2fbd3c4 Encoding: Fix build error with Sun 5.9 compiler. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f2fbd3c4f548e7afe4f3ab7b3fa3df2268a954ef commit f2fbd3c4f548e7afe4f3ab7b3fa3df2268a954ef Author: Clinton Stimpson clin...@elemtech.com AuthorDate: Thu Jul 17 08:42:28 2014 -0600 Commit: Clinton Stimpson clin...@elemtech.com CommitDate: Thu Jul 17 08:42:28 2014 -0600 Encoding: Fix build error with Sun 5.9 compiler. diff --git a/Tests/CTestTestMemcheck/memtester.cxx.in b/Tests/CTestTestMemcheck/memtester.cxx.in index fd8a2a8..43c0ba7 100644 --- a/Tests/CTestTestMemcheck/memtester.cxx.in +++ b/Tests/CTestTestMemcheck/memtester.cxx.in @@ -1,6 +1,7 @@ #include cmSystemTools.h #include cmsys/Encoding.hxx #include string +#include locale.h #define RETVAL @_retval@ --- Summary of changes: Tests/CTestTestMemcheck/memtester.cxx.in |1 + 1 file changed, 1 insertion(+) 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.0.0-4356-g0770ae4
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 0770ae418e8744515adad65f0941d3594df239e1 (commit)
via a4d462d6c607d9970885d3a3ca7d879bde2dd333 (commit)
from 0d1ac351bc47e6c8d9e697e730d2abbf68e4f697 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0770ae418e8744515adad65f0941d3594df239e1
commit 0770ae418e8744515adad65f0941d3594df239e1
Merge: 0d1ac35 a4d462d
Author: Bill Hoffman bill.hoff...@kitware.com
AuthorDate: Thu Jul 17 11:36:20 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jul 17 11:36:20 2014 -0400
Merge topic 'fix_guard_malloc_forbc' into next
a4d462d6 Add checks for malloc guard in the Bounds Checker test.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a4d462d6c607d9970885d3a3ca7d879bde2dd333
commit a4d462d6c607d9970885d3a3ca7d879bde2dd333
Author: Bill Hoffman bill.hoff...@kitware.com
AuthorDate: Thu Jul 17 11:32:48 2014 -0400
Commit: Bill Hoffman bill.hoff...@kitware.com
CommitDate: Thu Jul 17 11:32:48 2014 -0400
Add checks for malloc guard in the Bounds Checker test.
diff --git a/Tests/CTestTestMemcheck/CMakeLists.txt
b/Tests/CTestTestMemcheck/CMakeLists.txt
index d16d432..710994c 100644
--- a/Tests/CTestTestMemcheck/CMakeLists.txt
+++ b/Tests/CTestTestMemcheck/CMakeLists.txt
@@ -225,7 +225,7 @@
set_tests_properties(CTestTestMemcheckDummyValgrindIgnoreMemcheck
PASS_REGULAR_EXPRESSION \n2/2 Test #2: RunCMakeAgain
.*${ctest_and_tool_outputs}$)
set_tests_properties(CTestTestMemcheckDummyBC PROPERTIES
-PASS_REGULAR_EXPRESSION \n1/1 MemCheck #1: RunCMake \\.+ Passed
+[0-9]+.[0-9]+ sec\n\n100% tests passed, 0 tests failed out of 1\n(.*\n)?Error
parsing XML in stream at line 1: no element found\n)
+PASS_REGULAR_EXPRESSION \n1/1 MemCheck #1: RunCMake \\.+ Passed
+[0-9]+.[0-9]+ sec\n\n100% tests passed, 0 tests failed out of
1\n(.*\n)?${guard_malloc_lines}(\n)*Error parsing XML in stream at line 1: no
element found\n)
set_tests_properties(CTestTestMemcheckDummyValgrindInvalidSupFile PROPERTIES
PASS_REGULAR_EXPRESSION \nCannot find memory checker suppression file:
${CTEST_ESCAPED_REALPATH_CMAKE_CURRENT_BINARY_DIR}/does-not-exist\n)
---
Summary of changes:
Tests/CTestTestMemcheck/CMakeLists.txt |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, next, updated. v3.0.0-4358-g543d27d
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 543d27db2cb4aa56bfe15fa5ee86b952df9a9b83 (commit)
via 7a9909db86ec9bf7c40ad6c7a965701017c3849d (commit)
from 0770ae418e8744515adad65f0941d3594df239e1 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=543d27db2cb4aa56bfe15fa5ee86b952df9a9b83
commit 543d27db2cb4aa56bfe15fa5ee86b952df9a9b83
Merge: 0770ae4 7a9909d
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Jul 17 13:50:02 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jul 17 13:50:02 2014 -0400
Merge topic 'vs-MSTool-condition' into next
7a9909db VS: Make MS-tool-specific options conditional
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7a9909db86ec9bf7c40ad6c7a965701017c3849d
commit 7a9909db86ec9bf7c40ad6c7a965701017c3849d
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Jun 10 10:13:00 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Thu Jul 17 13:37:55 2014 -0400
VS: Make MS-tool-specific options conditional
Make blocks adding MS-tool-specific options conditional on a
new MSTools boolean member of cmVisualStudio10TargetGenerator.
Hard-code the member to true for now to preserve existing behavior.
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx
b/Source/cmVisualStudio10TargetGenerator.cxx
index 0458bd6..15439f6 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -41,58 +41,74 @@
cmIDEFlagTable const* cmVisualStudio10TargetGenerator::GetClFlagTable() const
{
- cmLocalVisualStudioGenerator::VSVersion
-v = this-LocalGenerator-GetVersion();
- if(v = cmLocalVisualStudioGenerator::VS14)
-{ return cmVS14CLFlagTable; }
- else if(v = cmLocalVisualStudioGenerator::VS12)
-{ return cmVS12CLFlagTable; }
- else if(v == cmLocalVisualStudioGenerator::VS11)
-{ return cmVS11CLFlagTable; }
- else
-{ return cmVS10CLFlagTable; }
+ if(this-MSTools)
+{
+cmLocalVisualStudioGenerator::VSVersion
+ v = this-LocalGenerator-GetVersion();
+if(v = cmLocalVisualStudioGenerator::VS14)
+ { return cmVS14CLFlagTable; }
+else if(v = cmLocalVisualStudioGenerator::VS12)
+ { return cmVS12CLFlagTable; }
+else if(v == cmLocalVisualStudioGenerator::VS11)
+ { return cmVS11CLFlagTable; }
+else
+ { return cmVS10CLFlagTable; }
+}
+ return 0;
}
cmIDEFlagTable const* cmVisualStudio10TargetGenerator::GetRcFlagTable() const
{
- cmLocalVisualStudioGenerator::VSVersion
-v = this-LocalGenerator-GetVersion();
- if(v = cmLocalVisualStudioGenerator::VS14)
-{ return cmVS14RCFlagTable; }
- else if(v = cmLocalVisualStudioGenerator::VS12)
-{ return cmVS12RCFlagTable; }
- else if(v == cmLocalVisualStudioGenerator::VS11)
-{ return cmVS11RCFlagTable; }
- else
-{ return cmVS10RCFlagTable; }
+ if(this-MSTools)
+{
+cmLocalVisualStudioGenerator::VSVersion
+ v = this-LocalGenerator-GetVersion();
+if(v = cmLocalVisualStudioGenerator::VS14)
+ { return cmVS14RCFlagTable; }
+else if(v = cmLocalVisualStudioGenerator::VS12)
+ { return cmVS12RCFlagTable; }
+else if(v == cmLocalVisualStudioGenerator::VS11)
+ { return cmVS11RCFlagTable; }
+else
+ { return cmVS10RCFlagTable; }
+}
+ return 0;
}
cmIDEFlagTable const* cmVisualStudio10TargetGenerator::GetLibFlagTable() const
{
- cmLocalVisualStudioGenerator::VSVersion
-v = this-LocalGenerator-GetVersion();
- if(v = cmLocalVisualStudioGenerator::VS14)
-{ return cmVS14LibFlagTable; }
- else if(v = cmLocalVisualStudioGenerator::VS12)
-{ return cmVS12LibFlagTable; }
- else if(v == cmLocalVisualStudioGenerator::VS11)
-{ return cmVS11LibFlagTable; }
- else
-{ return cmVS10LibFlagTable; }
+ if(this-MSTools)
+{
+cmLocalVisualStudioGenerator::VSVersion
+ v = this-LocalGenerator-GetVersion();
+if(v = cmLocalVisualStudioGenerator::VS14)
+ { return cmVS14LibFlagTable; }
+else if(v = cmLocalVisualStudioGenerator::VS12)
+ { return cmVS12LibFlagTable; }
+else if(v == cmLocalVisualStudioGenerator::VS11)
+ { return cmVS11LibFlagTable; }
+else
+ { return cmVS10LibFlagTable; }
+}
+ return 0;
}
cmIDEFlagTable const* cmVisualStudio10TargetGenerator::GetLinkFlagTable() const
{
- cmLocalVisualStudioGenerator::VSVersion
-v = this-LocalGenerator-GetVersion();
- if(v = cmLocalVisualStudioGenerator::VS14)
-{ return cmVS14LinkFlagTable; }
- else if(v = cmLocalVisualStudioGenerator::VS12)
-{ return
[Cmake-commits] CMake branch, next, updated. v3.0.0-4364-g961f90f
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 961f90fa7168c618ec7c98857887b3a22cff0c9d (commit)
via e7fdb44b1be63e18d03e86f61611dba677e98978 (commit)
via 6e176e6d9efa80fb4d08f1ead6bc33f115f8885d (commit)
via d3d9218a52dad04c1cfa87e537d98ee0678db1db (commit)
via eeb60102e813c6c69546e4257a332ede4e234171 (commit)
via ecb34faaaba841aac6dae722dd2c6256a1472d74 (commit)
from 543d27db2cb4aa56bfe15fa5ee86b952df9a9b83 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=961f90fa7168c618ec7c98857887b3a22cff0c9d
commit 961f90fa7168c618ec7c98857887b3a22cff0c9d
Merge: 543d27d e7fdb44
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Jul 17 16:46:37 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jul 17 16:46:37 2014 -0400
Merge topic 'delay-generator-platform' into next
e7fdb44b VS: Delay detection of VS 10 Express 64-bit tools
6e176e6d VS: Delay platform definitions until system name is known
d3d9218a VS: Remove unused method from VS 9 generator
eeb60102 VS: Refactor CMAKE_FORCE_*64 platform definitions
ecb34faa Tell generators about CMAKE_SYSTEM_NAME as soon as it is known
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e7fdb44b1be63e18d03e86f61611dba677e98978
commit e7fdb44b1be63e18d03e86f61611dba677e98978
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Jul 17 16:35:41 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Thu Jul 17 16:35:41 2014 -0400
VS: Delay detection of VS 10 Express 64-bit tools
Wait until SetSystemName when the CMAKE_SYSTEM_NAME is known.
Later the decision to use 64-bit tools may depend on it.
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx
b/Source/cmGlobalVisualStudio10Generator.cxx
index 03b2b2f..043f89d 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -128,6 +128,13 @@
cmGlobalVisualStudio10Generator::SetGeneratorToolset(std::string const ts,
bool cmGlobalVisualStudio10Generator::SetSystemName(std::string const s,
cmMakefile* mf)
{
+ if(this-PlatformName == Itanium || this-PlatformName == x64)
+{
+if(this-IsExpressEdition() !this-Find64BitTools(mf))
+ {
+ return false;
+ }
+}
this-AddVSPlatformToolsetDefinition(mf);
return this-cmGlobalVisualStudio8Generator::SetSystemName(s, mf);
}
@@ -203,14 +210,6 @@ void cmGlobalVisualStudio10Generator
::EnableLanguage(std::vectorstd::stringconst lang,
cmMakefile *mf, bool optional)
{
- if(this-PlatformName == Itanium || this-PlatformName == x64)
-{
-if(this-IsExpressEdition() !this-Find64BitTools(mf))
- {
- return;
- }
-}
-
for(std::vectorstd::string::const_iterator it = lang.begin();
it != lang.end(); ++it)
{
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6e176e6d9efa80fb4d08f1ead6bc33f115f8885d
commit 6e176e6d9efa80fb4d08f1ead6bc33f115f8885d
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Jul 17 16:34:21 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Thu Jul 17 16:34:21 2014 -0400
VS: Delay platform definitions until system name is known
Move the definition of CMAKE_VS_PLATFORM_NAME and other variables that
are not needed by CMakeDetermineSystem out of the AddPlatformDefinitions
method and into a SetSystemName method. The latter may later use
CMAKE_SYSTEM_NAME to decide what platform-specific definitions to add.
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx
b/Source/cmGlobalVisualStudio10Generator.cxx
index 80d08b9..03b2b2f 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -125,10 +125,11 @@
cmGlobalVisualStudio10Generator::SetGeneratorToolset(std::string const ts,
}
//
-void cmGlobalVisualStudio10Generator::AddPlatformDefinitions(cmMakefile* mf)
+bool cmGlobalVisualStudio10Generator::SetSystemName(std::string const s,
+cmMakefile* mf)
{
- cmGlobalVisualStudio8Generator::AddPlatformDefinitions(mf);
this-AddVSPlatformToolsetDefinition(mf);
+ return this-cmGlobalVisualStudio8Generator::SetSystemName(s, mf);
}
//
diff --git a/Source/cmGlobalVisualStudio10Generator.h
b/Source/cmGlobalVisualStudio10Generator.h
index
[Cmake-commits] CMake branch, next, updated. v3.0.0-4366-gd87fc2d
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 d87fc2dad7042b5ccbca6704d0ed75646eec (commit)
via 7a526c35f60ced43606bf028a21dedfaac77c2e9 (commit)
from 961f90fa7168c618ec7c98857887b3a22cff0c9d (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d87fc2dad7042b5ccbca6704d0ed75646eec
commit d87fc2dad7042b5ccbca6704d0ed75646eec
Merge: 961f90f 7a526c3
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Jul 17 17:01:05 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jul 17 17:01:05 2014 -0400
Merge topic 'delay-generator-platform' into next
7a526c35 VS: Delay getting platform name in local generator
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7a526c35f60ced43606bf028a21dedfaac77c2e9
commit 7a526c35f60ced43606bf028a21dedfaac77c2e9
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Jul 17 16:58:34 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Thu Jul 17 16:59:53 2014 -0400
VS: Delay getting platform name in local generator
Ask the global generator during generation instead of trying
to store it up front. Later the global generator may not know
the platform name when it is creating the local generator.
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx
b/Source/cmGlobalVisualStudio10Generator.cxx
index 043f89d..c1b087a 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -168,7 +168,6 @@ cmLocalGenerator
*cmGlobalVisualStudio10Generator::CreateLocalGenerator()
{
cmLocalVisualStudio10Generator* lg =
new cmLocalVisualStudio10Generator(cmLocalVisualStudioGenerator::VS10);
- lg-SetPlatformName(this-GetPlatformName());
lg-SetGlobalGenerator(this);
return lg;
}
diff --git a/Source/cmGlobalVisualStudio11Generator.cxx
b/Source/cmGlobalVisualStudio11Generator.cxx
index 0bd51ea..e5a159b 100644
--- a/Source/cmGlobalVisualStudio11Generator.cxx
+++ b/Source/cmGlobalVisualStudio11Generator.cxx
@@ -147,7 +147,6 @@ cmLocalGenerator
*cmGlobalVisualStudio11Generator::CreateLocalGenerator()
{
cmLocalVisualStudio10Generator* lg =
new cmLocalVisualStudio10Generator(cmLocalVisualStudioGenerator::VS11);
- lg-SetPlatformName(this-GetPlatformName());
lg-SetGlobalGenerator(this);
return lg;
}
diff --git a/Source/cmGlobalVisualStudio12Generator.cxx
b/Source/cmGlobalVisualStudio12Generator.cxx
index 47c43fa..4235cbc 100644
--- a/Source/cmGlobalVisualStudio12Generator.cxx
+++ b/Source/cmGlobalVisualStudio12Generator.cxx
@@ -127,7 +127,6 @@ cmLocalGenerator
*cmGlobalVisualStudio12Generator::CreateLocalGenerator()
{
cmLocalVisualStudio10Generator* lg =
new cmLocalVisualStudio10Generator(cmLocalVisualStudioGenerator::VS12);
- lg-SetPlatformName(this-GetPlatformName());
lg-SetGlobalGenerator(this);
return lg;
}
diff --git a/Source/cmGlobalVisualStudio14Generator.cxx
b/Source/cmGlobalVisualStudio14Generator.cxx
index 076b057..d001f93 100644
--- a/Source/cmGlobalVisualStudio14Generator.cxx
+++ b/Source/cmGlobalVisualStudio14Generator.cxx
@@ -108,7 +108,6 @@ cmLocalGenerator
*cmGlobalVisualStudio14Generator::CreateLocalGenerator()
{
cmLocalVisualStudio10Generator* lg =
new cmLocalVisualStudio10Generator(cmLocalVisualStudioGenerator::VS14);
- lg-SetPlatformName(this-GetPlatformName());
lg-SetGlobalGenerator(this);
return lg;
}
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx
b/Source/cmGlobalVisualStudio8Generator.cxx
index 1bac322..9fd3d5a 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -126,7 +126,6 @@ cmLocalGenerator
*cmGlobalVisualStudio8Generator::CreateLocalGenerator()
{
cmLocalVisualStudio7Generator *lg =
new cmLocalVisualStudio7Generator(cmLocalVisualStudioGenerator::VS8);
- lg-SetPlatformName(this-GetPlatformName());
lg-SetExtraFlagTable(this-GetExtraFlagTableVS8());
lg-SetGlobalGenerator(this);
return lg;
diff --git a/Source/cmGlobalVisualStudio9Generator.cxx
b/Source/cmGlobalVisualStudio9Generator.cxx
index 00d9179..1d73b5c 100644
--- a/Source/cmGlobalVisualStudio9Generator.cxx
+++ b/Source/cmGlobalVisualStudio9Generator.cxx
@@ -115,7 +115,6 @@ cmLocalGenerator
*cmGlobalVisualStudio9Generator::CreateLocalGenerator()
{
cmLocalVisualStudio7Generator *lg
= new cmLocalVisualStudio7Generator(cmLocalVisualStudioGenerator::VS9);
- lg-SetPlatformName(this-GetPlatformName());
lg-SetExtraFlagTable(this-GetExtraFlagTableVS8());
lg-SetGlobalGenerator(this);
return lg;
diff --git
[Cmake-commits] CMake branch, master, updated. v3.0.0-1429-gbbd930e
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 bbd930ea3c7fbc376d2f112ae7cd373a27cdf5bc (commit) from e4510941a3cc5f2990d79242db791bf370bb07d3 (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bbd930ea3c7fbc376d2f112ae7cd373a27cdf5bc commit bbd930ea3c7fbc376d2f112ae7cd373a27cdf5bc Author: Kitware Robot kwro...@kitware.com AuthorDate: Fri Jul 18 00:01:11 2014 -0400 Commit: Kitware Robot kwro...@kitware.com CommitDate: Fri Jul 18 00:01:11 2014 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index eb5dd2e..b0a7f64 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 0) -set(CMake_VERSION_PATCH 20140717) +set(CMake_VERSION_PATCH 20140718) #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
