[cmake-developers] [CMake 0014779]: CMAKE_TOOLCHAIN_FILE broken when used with child CMake process
The following issue has been SUBMITTED.
==
http://www.cmake.org/Bug/view.php?id=14779
==
Reported By:Domagoj Saric
Assigned To:
==
Project:CMake
Issue ID: 14779
Category: CMake
Reproducibility:always
Severity: major
Priority: normal
Status: new
==
Date Submitted: 2014-02-28 04:30 EST
Last Modified: 2014-02-28 04:30 EST
==
Summary:CMAKE_TOOLCHAIN_FILE broken when used with child
CMake process
Description:
When -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchainFile is specified in a child CMake
invocation from a parent CMake project the configure phase fails with a file
not found error reported for the specified toolchainFile.
Steps to Reproduce:
- load a project in CMake GUI which uses a toolchain file
- this project/CMakeLists.txt must within itself again call execute_process(
${CMAKE_COMMAND} ... -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchainFile ... )
- press Configure
- the child CMake invocation will fail with a file not found error...
Additional Information:
The generator used was Eclipse + MinGW Makefiles...
==
Issue History
Date ModifiedUsername FieldChange
==
2014-02-28 04:30 Domagoj Saric New Issue
==
--
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] Watcom import library fails if no symbols in the DLL
On 02/27/2014 03:39 PM, J Decker wrote: the correct way is to build the import library during the wlink step using 'option implib[=libname]' Wonderful, thanks! Watcom: Fix creation of DLLs without any exported symbols http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=00503d38 -Brad -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] Cmake contribution for Open Watcom (patch)
On 02/28/2014 12:57 PM, Jiri Malak wrote:
I would like contribute to CMake for Open Watcom Toolchain.
Thanks!
I've integrated the first change for testing here:
Watcom: Fix static library name quoting for wlib
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;hb=5c5be193
with one tweak:
-set(CMAKE_CXX_CREATE_STATIC_LIBRARY wlib ${CMAKE_LIB_QUIET} -c -n -b
'TARGET_UNQUOTED' LINK_FLAGS OBJECTS )
+set(CMAKE_CXX_CREATE_STATIC_LIBRARY wlib ${CMAKE_LIB_QUIET} -c -n -b
TARGET_QUOTED OBJECTS )
The LINK_FLAGS placeholder is still needed. It gets the
STATIC_LIBRARY_FLAGS:
http://www.cmake.org/cmake/help/v2.8.12/cmake.html#prop_tgt:STATIC_LIBRARY_FLAGS
The LinkFlags* tests revealed this when I tested locally.
FYI, you can run the test suite with the Open Watcom compiler
by configuring to build with another compiler but setting
CMAKE_TEST_GENERATOR and CMAKE_TEST_MAKEPROGRAM to be
Watcom WMake and c:/path/to/wmake.exe, respectively.
Then after building, open a terminal in an environment set up
for Open Watcom and run bin\ctest to run the tests. Add
options -j 8 for parallel testing or -R someregex to
run a subset of tests or -V to see verbose test output.
In order to generalize support for this compiler to other
platforms the Platform/Windows-wcl386.cmake module will need
to be refactored into the modern way of dividing platform
information across multiple files. See the
Compiler/GNU.cmake
Compiler/GNU-C.cmake
Compiler/GNU-CXX.cmake
Platform/Windows-GNU.cmake
Platform/Windows-GNU-C.cmake
Platform/Windows-GNU-CXX.cmake
files. One might refactor Platform/Windows-wcl386.cmake into
Compiler/Watcom.cmake
Compiler/Watcom-C.cmake
Compiler/Watcom-CXX.cmake
Platform/Windows-Watcom.cmake
Platform/Windows-Watcom-C.cmake
Platform/Windows-Watcom-CXX.cmake
for example.
Thanks,
-Brad
--
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
[cmake-developers] CMake 3.0-rc1 now ready for testing!
I am proud to announce that CMake 3.0 has entered the release candidate stage. Sources and binaries are available at: http://www.cmake.org/files/v3.0/?C=M;O=D Documentation is available at: http://www.cmake.org/cmake/help/v3.0 Release notes appear below and are also published at http://www.cmake.org/cmake/help/v3.0/release/3.0.0.html Some of the more significant features of CMake 3.0 are: * Compatibility options supporting code written for CMake versions prior to 2.4 have been removed. * The CMake language has been extended with *Bracket Argument* and *Bracket Comment* syntax inspired by Lua long brackets. * The CMake documentation has been converted to reStructuredText and uses Sphix generation. * Generators for Visual Studio 10 (2010) and later were renamed to include the product year like generators for older VS versions: * Visual Studio 10 - Visual Studio 10 2010 * Visual Studio 11 - Visual Studio 11 2012 * Visual Studio 12 - Visual Studio 12 2013 This clarifies which generator goes with each Visual Studio version. The old names are recognized for compatibility. * A new CodeLite extra generator is available for use with the Makefile or Ninja generators. * A new Kate extra generator is available for use with the Makefile or Ninja generators. * The add_library() command learned a new INTERFACE library type. Interface libraries have no build rules but may have properties defining usage requirements and may be installed, exported, and imported. This is useful to create header-only libraries that have concrete link dependencies on other libraries. * The export() command learned a new EXPORT mode that retrieves the list of targets to export from an export set configured by the install(TARGETS) command EXPORT option. This makes it easy to export from the build tree the same targets that are exported from the install tree. * The project() command learned to set some version variables to values specified by the new VERSION option or to empty strings. See policy CMP0048. * Several long-outdated commands that should no longer be called have been disallowed in new code by policies: * Policy CMP0029 disallows subdir_depends() * Policy CMP0030 disallows use_mangled_mesa() * Policy CMP0031 disallows load_command() * Policy CMP0032 disallows output_required_files() * Policy CMP0033 disallows export_library_dependencies() * Policy CMP0034 disallows utility_source() * Policy CMP0035 disallows variable_requires() * Policy CMP0036 disallows build_name() CMake 3.0.0 Release Notes * Changes made since CMake 2.8.12.2 include the following. Documentation Changes = * The CMake documentation has been converted to reStructuredText and now transforms via Sphinx (http://sphinx-doc.org) into man and html pages. This allows the documentation to be properly indexed and to contain cross-references. Conversion from the old internal documentation format was done by an automatic process so some documents may still contain artifacts. They will be updated incrementally over time. A basic reStructuredText processor has been implemented to support cmake --help-command and similar command-line options. * New manuals were added: * cmake-buildsystem(7) * cmake-commands(7), replacing cmakecommands(1) and cmakecompat(1) * cmake-developer(7) * cmake-generator-expressions(7) * cmake-generators(7) * cmake-language(7) * cmake-modules(7), replacing cmakemodules(1) * cmake-packages(7) * cmake-policies(7), replacing cmakepolicies(1) * cmake-properties(7), replacing cmakeprops(1) * cmake-qt(7) * cmake-toolchains(7) * cmake-variables(7), replacing cmakevars(1) * Release notes for CMake 3.0.0 and above will now be included with the html documentation. New Features Syntax -- * The CMake language has been extended with *Bracket Argument* and *Bracket Comment* syntax inspired by Lua long brackets: set(x [===[bracket argument]===] #[[bracket comment]]) Content between equal-length open- and close-brackets is taken literally with no variable replacements. Warning: This syntax change could not be made in a fully compatible way. No policy is possible because syntax parsing occurs before any chance to set a policy. Existing code using an unquoted argument that starts with an open bracket will be interpreted differently without any diagnostic. Fortunately the syntax is obscure enough that this problem is unlikely in practice. Generators -- * A new CodeLite extra generator is available for use with the Makefile or Ninja generators. * A new Kate extra generator is available for use with the Makefile or Ninja generators. * The Ninja generator learned to use ninja job pools when specified by a new JOB_POOLS global property. Commands * The add_library() command learned a new INTERFACE
Re: [cmake-developers] Cmake contribution for Open Watcom (patch)
Thanks!
I've integrated the first change for testing here:
Watcom: Fix static library name quoting for wlib
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;hb=5c5be193
with one tweak:
-set(CMAKE_CXX_CREATE_STATIC_LIBRARY wlib ${CMAKE_LIB_QUIET} -c -n -b
'TARGET_UNQUOTED'
LINK_FLAGS OBJECTS )
+set(CMAKE_CXX_CREATE_STATIC_LIBRARY wlib ${CMAKE_LIB_QUIET} -c -n -b
TARGET_QUOTED
OBJECTS )
The LINK_FLAGS placeholder is still needed. It gets the
STATIC_LIBRARY_FLAGS:
http://www.cmake.org/cmake/help/v2.8.12/cmake.html#prop_tgt:STATIC_LIBRARY_FLAGS
The LinkFlags* tests revealed this when I tested locally.
Good to know. It is confusing to mix Librarian flags with Linker flags.
It was for some historical reason?
FYI, you can run the test suite with the Open Watcom compiler
by configuring to build with another compiler but setting
CMAKE_TEST_GENERATOR and CMAKE_TEST_MAKEPROGRAM to be
Watcom WMake and c:/path/to/wmake.exe, respectively.
Then after building, open a terminal in an environment set up
for Open Watcom and run bin\ctest to run the tests. Add
options -j 8 for parallel testing or -R someregex to
run a subset of tests or -V to see verbose test output.
Thanks for hint, it is very useful.
In order to generalize support for this compiler to other
platforms the Platform/Windows-wcl386.cmake module will need
to be refactored into the modern way of dividing platform
information across multiple files. See the
Compiler/GNU.cmake
Compiler/GNU-C.cmake
Compiler/GNU-CXX.cmake
Platform/Windows-GNU.cmake
Platform/Windows-GNU-C.cmake
Platform/Windows-GNU-CXX.cmake
files. One might refactor Platform/Windows-wcl386.cmake into
Compiler/Watcom.cmake
Compiler/Watcom-C.cmake
Compiler/Watcom-CXX.cmake
Platform/Windows-Watcom.cmake
Platform/Windows-Watcom-C.cmake
Platform/Windows-Watcom-CXX.cmake
for example.
I a little studied CMake internals, that it is exactly what I want to do.
I will add also OW Fortran compiler and OW asseblers definitions.
Regards
Jiri
--
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] Cmake contribution for Open Watcom (patch)
On 02/28/2014 02:38 PM, Jiri Malak wrote: The LINK_FLAGS placeholder is still needed. It gets the STATIC_LIBRARY_FLAGS: It is confusing to mix Librarian flags with Linker flags. The LINK_FLAGS placeholder is just an implementation detail whose name does not matter. For actual linker calls it gets the LINKER_FLAGS information but for librarian and archiver calls (for STATIC libs) it gets the STATIC_LIBRARY_FLAGS value, not any linker flags. -Brad -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] [Generator] Android.mk
Thanks for your response Brad. There is also a Visual Studio plugin developed by NVidia (NSight Tegra) that can build (and debug) Android source from within Visual Studio. I would also like to see a generator for NSight Tegra sln/vcproj files. Do you foresee any problems with that? Thanks, Vince On Thu, Feb 27, 2014 at 6:21 AM, Brad King brad.k...@kitware.com wrote: On 02/26/2014 05:21 PM, Vince Harron wrote: The question is, how does the cmake project decide on new features? There is no formal process. It is just discussion here of the feasibility, design, merits, etc. Also for non-trivial changes we'd like to feel confident that the contributor will stick around for a while to deal with repercussions. Before I begin implementation, I would like to know definitively that this would be accepted if implemented properly. An Andorid.mk generator would be well within scope AFAICT. So long as the implementation is sound and maintainable (i.e. properly refactors existing code as needed instead of cut-n-paste) it would be accepted. We'd also ask that nightly testing be contributed to the dashboard on a permanent basis to keep the feature working. Thanks, -Brad -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers -- Vince Harron | Technical Lead Manager | vhar...@google.com | 858-442-0868 -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] [Generator] Android.mk
On 02/28/2014 03:17 PM, Vince Harron wrote: I would also like to see a generator for NSight Tegra sln/vcproj files. Do you foresee any problems with that? Not currently, though I'm not familiar with those tools. The VS generators have a factory mechanism to compute the set of available generators (e.g. for WinCE platforms) based on the installed tools on the host. That could be extended to detect when this plugin is available. Are there fundamental differences in these project files? Do they just look like normal project files plus some custom property settings? -Brad -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
[cmake-developers] [Review request] Topic FeatureSummary_combine_WHAT_values
Dear CMake developers, Please review the topic FeatureSummary_combine_WHAT_values. This patch allows to combine and reorder values for the WHAT option in FeatureSummary. For example it is now possible to do feature_summary(WHAT ENABLED_FEATURES DISABLED_FEATURES) That produces an output like: -- -- The following features have been enabled: * Feature1 * Feature2 -- The following features have been disabled: * Feature2 Skipping the lists that are empty. Without this patch this would require to do: message(STATUS ) feature_summary(WHAT ENABLED_FEATURES DESCRIPTION The following features have been enabled:) feature_summary(WHAT DISABLED_FEATURES DESCRIPTION The following features have been disabled:) And empty lists would not be skipped. The behaviour when WHAT has a single argument (ALL or any option) is unchanged. Thanks. Regards, Daniele P.S. Sorry if I disappeared but I've been very busy, I should have some more time now to finish the other patches that I left behind. -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
[cmake-developers] [CMake 0014780]: Install bash completions properly
The following issue has been SUBMITTED. == http://public.kitware.com/Bug/view.php?id=14780 == Reported By:Orion Poplawski Assigned To: == Project:CMake Issue ID: 14780 Category: (No Category) Reproducibility:always Severity: minor Priority: normal Status: new == Date Submitted: 2014-02-28 16:35 EST Last Modified: 2014-02-28 16:35 EST == Summary:Install bash completions properly Description: bash completions should be installed into `pkg-config --variable=completionsdir bash-completion`. == Issue History Date ModifiedUsername FieldChange == 2014-02-28 16:35 Orion PoplawskiNew Issue == -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] Cmake contribution for Open Watcom (patch)
That continues to be broken for what we talked about in the newsgroup;
The wlib should be removed *???*
On Fri, Feb 28, 2014 at 9:57 AM, Jiri Malak malak.j...@gmail.com wrote:
Hi,
I would like contribute to CMake for Open Watcom Toolchain.
Now only WIN32 host and target is supported.
I plan to add cross-compilation configuration for all supported hosts and
target.
By example enable user on Linux cross compile for DOS/WIN16/win32/OS2
etc.
I enclosed first fix for existing bug in OW support.
From 503538874023eeddac975eb09660d59f4067fcd9 Mon Sep 17 00:00:00 2001
From: Jiri Malak malak.j...@gmail.com
http://192.168.0.2/posta/src/compose.php?send_to=malak.jiri%40gmail.com
Date: Fri, 28 Feb 2014 18:21:52 +0100
Subject: [PATCH] Open Watcom Module Windows-wcl386.cmake fix
fix incorrect quoting of library name, now it is double quote instead of
incorrect
single quote
---
Modules/Platform/Windows-wcl386.cmake | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Modules/Platform/Windows-wcl386.cmake
b/Modules/Platform/Windows-wcl386.cmake
index 8a03b29..329e6f0 100644
--- a/Modules/Platform/Windows-wcl386.cmake
+++ b/Modules/Platform/Windows-wcl386.cmake
@@ -40,7 +40,7 @@ set (CMAKE_C_STANDARD_LIBRARIES_INIT library clbrdll.lib
library
plbrdll.lib l
set (CMAKE_CXX_STANDARD_LIBRARIES_INIT ${CMAKE_C_STANDARD_LIBRARIES_INIT})
set(CMAKE_C_CREATE_IMPORT_LIBRARY
- wlib -c -q -n -b TARGET_IMPLIB +'TARGET_UNQUOTED')
+ wlib -c -q -n -b TARGET_IMPLIB +TARGET_QUOTED)
set(CMAKE_CXX_CREATE_IMPORT_LIBRARY ${CMAKE_C_CREATE_IMPORT_LIBRARY})
set(CMAKE_C_LINK_EXECUTABLE
@@ -78,7 +78,7 @@ set(CMAKE_C_CREATE_SHARED_LIBRARY
${CMAKE_CXX_CREATE_SHARED_LIBRARY})
set(CMAKE_C_CREATE_SHARED_MODULE ${CMAKE_CXX_CREATE_SHARED_MODULE})
# create a C++ static library
-set(CMAKE_CXX_CREATE_STATIC_LIBRARY wlib ${CMAKE_LIB_QUIET} -c -n -b
'TARGET_UNQUOTED'
LINK_FLAGS OBJECTS )
+set(CMAKE_CXX_CREATE_STATIC_LIBRARY wlib ${CMAKE_LIB_QUIET} -c -n -b
TARGET_QUOTED OBJECTS )
# create a C static library
set(CMAKE_C_CREATE_STATIC_LIBRARY ${CMAKE_CXX_CREATE_STATIC_LIBRARY})
--
1.8.0.msysgit.0
Regards
Jiri
--
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
--
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] Cmake contribution for Open Watcom (patch)
THere is 'toolchain' support sort-of in cmake, for selecting targets
Something else that cmake building is lacking is a working RC compiler
default...
SET( CMAKE_RC_COMPILER rc )
# I dunno; something about floating point, not sure if it's required it's
from long ago... probably because I was linking to stdio sscanf but didn't
use a string that had a %g or %f in it so floating point support wasn't
linkin...
set( ExtraFlags ${ExtraFlags} /fp5 /fpi87 )
# this flag is for build dll? emit DllRuntime startup link
#set( LibraryExtraFlags -bd )
set( ConsoleProgramExtraFlags -bc )
set( WindowsProgramExtraFlags -bg )
when adding 'add_executable( target optional WIN32 ... ) '
there is a marker for wheter to include console or windows runtime (select
main or winmain entry points)
and for add_library( target optional SHARED ... ) should add -bd
yes?
On Fri, Feb 28, 2014 at 9:57 AM, Jiri Malak malak.j...@gmail.com wrote:
Hi,
I would like contribute to CMake for Open Watcom Toolchain.
Now only WIN32 host and target is supported.
I plan to add cross-compilation configuration for all supported hosts and
target.
By example enable user on Linux cross compile for DOS/WIN16/win32/OS2
etc.
I enclosed first fix for existing bug in OW support.
From 503538874023eeddac975eb09660d59f4067fcd9 Mon Sep 17 00:00:00 2001
From: Jiri Malak malak.j...@gmail.com
http://192.168.0.2/posta/src/compose.php?send_to=malak.jiri%40gmail.com
Date: Fri, 28 Feb 2014 18:21:52 +0100
Subject: [PATCH] Open Watcom Module Windows-wcl386.cmake fix
fix incorrect quoting of library name, now it is double quote instead of
incorrect
single quote
---
Modules/Platform/Windows-wcl386.cmake | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Modules/Platform/Windows-wcl386.cmake
b/Modules/Platform/Windows-wcl386.cmake
index 8a03b29..329e6f0 100644
--- a/Modules/Platform/Windows-wcl386.cmake
+++ b/Modules/Platform/Windows-wcl386.cmake
@@ -40,7 +40,7 @@ set (CMAKE_C_STANDARD_LIBRARIES_INIT library clbrdll.lib
library
plbrdll.lib l
set (CMAKE_CXX_STANDARD_LIBRARIES_INIT ${CMAKE_C_STANDARD_LIBRARIES_INIT})
set(CMAKE_C_CREATE_IMPORT_LIBRARY
- wlib -c -q -n -b TARGET_IMPLIB +'TARGET_UNQUOTED')
+ wlib -c -q -n -b TARGET_IMPLIB +TARGET_QUOTED)
set(CMAKE_CXX_CREATE_IMPORT_LIBRARY ${CMAKE_C_CREATE_IMPORT_LIBRARY})
set(CMAKE_C_LINK_EXECUTABLE
@@ -78,7 +78,7 @@ set(CMAKE_C_CREATE_SHARED_LIBRARY
${CMAKE_CXX_CREATE_SHARED_LIBRARY})
set(CMAKE_C_CREATE_SHARED_MODULE ${CMAKE_CXX_CREATE_SHARED_MODULE})
# create a C++ static library
-set(CMAKE_CXX_CREATE_STATIC_LIBRARY wlib ${CMAKE_LIB_QUIET} -c -n -b
'TARGET_UNQUOTED'
LINK_FLAGS OBJECTS )
+set(CMAKE_CXX_CREATE_STATIC_LIBRARY wlib ${CMAKE_LIB_QUIET} -c -n -b
TARGET_QUOTED OBJECTS )
# create a C static library
set(CMAKE_C_CREATE_STATIC_LIBRARY ${CMAKE_CXX_CREATE_STATIC_LIBRARY})
--
1.8.0.msysgit.0
Regards
Jiri
--
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
--
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
[cmake-developers] [Patch] Remove hard coded version of RTDLL for Open Watcom
Hi,
I enclosed next patch for Open Watcom toolchain, which remove hardcoded version
number for RTDLL.
It is derived from compiler version now that it will be working with OW version
above 1.9.
Regards
Jiri
From d00ad6f72f48575e36a06949cead524f35f56de4 Mon Sep 17 00:00:00 2001
From: Jiri Malak malak.j...@gmail.com
Date: Sat, 1 Mar 2014 03:32:28 +0100
Subject: [PATCH] Open Watcom remove hard coded version of C/C++ run-time DLL
Version number for RTDLL can be calculated from compiler version, now it will be working properly with any new version of OW
---
Modules/InstallRequiredSystemLibraries.cmake | 16
Modules/Platform/Windows-wcl386.cmake| 27 +--
2 files changed, 13 insertions(+), 30 deletions(-)
diff --git a/Modules/InstallRequiredSystemLibraries.cmake b/Modules/InstallRequiredSystemLibraries.cmake
index 013a028..90f09d9 100644
--- a/Modules/InstallRequiredSystemLibraries.cmake
+++ b/Modules/InstallRequiredSystemLibraries.cmake
@@ -366,18 +366,10 @@ endif()
if(WATCOM)
get_filename_component( CompilerPath ${CMAKE_C_COMPILER} PATH )
- if(WATCOM17)
- set( __install__libs ${CompilerPath}/clbr17.dll
- ${CompilerPath}/mt7r17.dll ${CompilerPath}/plbr17.dll )
- endif()
- if(WATCOM18)
- set( __install__libs ${CompilerPath}/clbr18.dll
- ${CompilerPath}/mt7r18.dll ${CompilerPath}/plbr18.dll )
- endif()
- if(WATCOM19)
- set( __install__libs ${CompilerPath}/clbr19.dll
- ${CompilerPath}/mt7r19.dll ${CompilerPath}/plbr19.dll )
- endif()
+ set( __install__libs
+ ${CompilerPath}/clbr${WATCOM_RTDLL_VERSION}.dll
+ ${CompilerPath}/mt7r${WATCOM_RTDLL_VERSION}.dll
+ ${CompilerPath}/plbr${WATCOM_RTDLL_VERSION}.dll )
foreach(lib
${__install__libs}
)
diff --git a/Modules/Platform/Windows-wcl386.cmake b/Modules/Platform/Windows-wcl386.cmake
index d40d718..067065d 100644
--- a/Modules/Platform/Windows-wcl386.cmake
+++ b/Modules/Platform/Windows-wcl386.cmake
@@ -40,13 +40,12 @@ set (CMAKE_C_STANDARD_LIBRARIES_INIT library clbrdll.lib library plbrdll.lib l
set (CMAKE_CXX_STANDARD_LIBRARIES_INIT ${CMAKE_C_STANDARD_LIBRARIES_INIT})
set(CMAKE_C_CREATE_IMPORT_LIBRARY
- wlib -c -q -n -b TARGET_IMPLIB +TARGET_QUOTED)
+wlib -c -q -n -b TARGET_IMPLIB +TARGET_QUOTED)
set(CMAKE_CXX_CREATE_IMPORT_LIBRARY ${CMAKE_C_CREATE_IMPORT_LIBRARY})
set(CMAKE_C_LINK_EXECUTABLE
wlink ${CMAKE_START_TEMP_FILE} ${CMAKE_WLINK_QUIET} name 'TARGET_UNQUOTED' LINK_FLAGS option caseexact file {OBJECTS} LINK_LIBRARIES ${CMAKE_END_TEMP_FILE})
-
set(CMAKE_CXX_LINK_EXECUTABLE ${CMAKE_C_LINK_EXECUTABLE})
# compile a C++ file into an object file
@@ -77,7 +76,7 @@ set(CMAKE_C_CREATE_SHARED_LIBRARY ${CMAKE_CXX_CREATE_SHARED_LIBRARY})
set(CMAKE_C_CREATE_SHARED_MODULE ${CMAKE_CXX_CREATE_SHARED_MODULE})
# create a C++ static library
-set(CMAKE_CXX_CREATE_STATIC_LIBRARY wlib ${CMAKE_LIB_QUIET} -c -n -b TARGET_QUOTED LINK_FLAGS OBJECTS )
+set(CMAKE_CXX_CREATE_STATIC_LIBRARY wlib ${CMAKE_LIB_QUIET} -c -n -b TARGET_QUOTED LINK_FLAGS OBJECTS)
# create a C static library
set(CMAKE_C_CREATE_STATIC_LIBRARY ${CMAKE_CXX_CREATE_STATIC_LIBRARY})
@@ -89,20 +88,12 @@ if(NOT _CMAKE_WATCOM_VERSION)
else()
set(_compiler_version ${CMAKE_CXX_COMPILER_VERSION})
endif()
- set(WATCOM16)
- set(WATCOM17)
- set(WATCOM18)
- set(WATCOM19)
- if(${_compiler_version} LESS 12.70)
-set(WATCOM16 1)
- endif()
- if(${_compiler_version} EQUAL 12.70)
-set(WATCOM17 1)
- endif()
- if(${_compiler_version} EQUAL 12.80)
-set(WATCOM18 1)
- endif()
- if(${_compiler_version} EQUAL 12.90)
-set(WATCOM19 1)
+ string(REGEX MATCHALL [0-9]+ _ow_version_list ${_compiler_version})
+ list(GET _ow_version_list 0 _major)
+ list(GET _ow_version_list 1 _minor)
+ if(_major GREATER 11)
+math(EXPR _major ${_major} - 11)
endif()
+ math(EXPR _minor ${_minor} / 10)
+ set(WATCOM_RTDLL_VERSION ${_major}${_minor})
endif()
--
1.8.0.msysgit.0
--
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] [Patch] Remove hard coded version of RTDLL for Open Watcom
and a fix for 'option implib[=...]' as part of the wlink since it's a one step anyway and not a dependant step On Fri, Feb 28, 2014 at 6:47 PM, Jiri Malak malak.j...@gmail.com wrote: Hi, I enclosed next patch for Open Watcom toolchain, which remove hardcoded version number for RTDLL. It is derived from compiler version now that it will be working with OW version above 1.9. Regards Jiri -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
[CMake] How to merge dependencies of a static lib with itself?
I am working on creating an SDK from an existing product's code base and use it as an independent static library. The issue I am facing is that the older product, let's say MM, used to link with all the dependencies in the executable but I have to provide one monolith SDK lib that contains all its dependencies within itself. I have struggled but couldn't find the way to achieve that in CMAKE. The structure of the code is such that the MMexe- old product's executable- depends on MMLib but MMLib in turn depends on 3rd party libs, let's say MM3PLib1 and MM3PLib2. In older CMAKE files, MMExe would depend on MM3PLib1 and MM3PLib2 so all dependencies were resolved at link time. But now, we need to create MMLib in such a way that its clients will not have to depend on, or link to, any other 3rd parties. In visual Studio, we can do it by using Librarian - General- Additional Dependencies. This way the generated MMLib contains all its dependencies by archiving them. I have tried multiple approaches but couldn't achieve the same result through CMAKE. Even after setting these values, the corresponding fields in VS are blank. I have tried following approaches in different ways in MMLib's CMAKE files and none of them seem to be working for me. -- link_directories (Path_To_MM3PLib1) set_target_properties( MMLib PROPERTIES LINK_FLAGS /LIBPATH:Path_To_MM3PLib1 ) set_target_properties( MMLib PROPERTIES IMPORTED_LOCATION (Path_To_MM3PLib1) ) add_library (MMLib STATIC Path_To_MM3PLib1/MM3PLib1.lib) add_library(MMLib Path_To_MM3PLib2/MM3PLib2.lib) target_link_libraries (MMLib MM3PLib1) target_link_libraries (MMLib MM3PLib2) target_link_libraries (MMLib MM3PLib1.lib) target_link_libraries (MMLib MM3PLib2.lib) --- Thanks, -Shobhit -- 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://www.cmake.org/mailman/listinfo/cmake
[CMake] CMake build for gnustep/libobjc2 on Ubuntu Touch
Hi dear list members, I have built libobjc2 using CMake with clang on several systems with X86 or ARM without a problem, but on Ubuntu Touch my build fails and I can't figure out what goes wrong. CMake complains when trying to configure the libobjc2 build: No C++ runtime library found Looking for include file pthread.h - not found Could NOT find Threads (missing: Threads_FOUND) Of course pthread.h is there (in /usr/include), so something weird happened that I would like to track down. Can someone tell me where I should start and what is the best way to debug the CMake process? In case someone is interested: I took the standard Ubuntu Touch build on a Nexus 10, installed the preconditions including build-essentials (gcc is 4.8.2) and built the trunk version of clang and installed it. Then I tried to build libobjc2. Thanks in advance, Mathias -- 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://www.cmake.org/mailman/listinfo/cmake
[CMake] CPack installation directory
Hello,
Using CMake version 2.8.12.1 on Windows 7
Here is a test project which produces a MSI which by default installs files to
C:\Program Files (x86)\Product\
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
PROJECT(TBD)
SET(CPACK_PACKAGE_NAME TBD)
SET(CPACK_INSTALL_PREFIX C:/TBD)
SET(CPACK_PACKAGE_INSTALL_DIRECTORY Product)
SET(CPACK_WIX_UPGRADE_GUID A8DAADFA-A2A6-3322-12A3-AF5CD7704008)
SET(CMAKE_INSTALL_PREFIX ${PROJECT_BINARY_DIR}/TBD)
INSTALL(
DIRECTORY img
DESTINATION img
COMPONENT res)
INCLUDE(CPack)
-
How can I configure the wix generator to produce a msi which by default install
files to c:\tbd ?
kind regards,
Lars
--
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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] CPack installation directory
On 02/28/2014 02:29 PM, Lars wrote: How can I configure the wix generator to produce a msi which by default install files to c:\tbd ? This is currently not possible. You can customize below the architecture specific Program Files directory with CPACK_PACKAGE_INSTALL_DIRECTORY but you can not change the default root itself. The NSIS generator seems to support CPACK_NSIS_INSTALL_ROOT for this purpose. I can look into supporting an equivalent CPACK_WIX_INSTALL_ROOT for WiX. Nils -- 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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] How to merge dependencies of a static lib with itself?
On 2014-02-28 05:47, Shobhit Shrivastava wrote: I am working on creating an SDK from an existing product's code base and use it as an independent static library. The issue I am facing is that the older product, let's say MM, used to link with all the dependencies in the executable but I have to provide one monolith SDK lib that contains all its dependencies within itself. I have struggled but couldn't find the way to achieve that in CMAKE. I'm not sure if it is possible in CMake to produce a static library that contains the objects from other static libraries. (I'm not even 100% sure it's possible in general, on Windows... I believe with AR-type libraries you could unpack the dependencies and repack their contents into your own library. Ugly, but doable.) However, if your downstream is also using CMake, you shouldn't need to; just provide exported targets for MM and make sure that the interface link libraries for MMlib include all of its dependencies. CMake will then take care that anything linking to MMlib will also pick up the interface dependencies. set_target_properties( MMLib PROPERTIES LINK_FLAGS /LIBPATH:Path_To_MM3PLib1 ) Don't do this; it's not portable. Set the interface link libraries instead. set_target_properties( MMLib PROPERTIES IMPORTED_LOCATION (Path_To_MM3PLib1) ) This won't do what you want; you're telling CMake that the library to link for the MMLib target is a third-party target, and not the MMlib library. -- Matthew -- 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://www.cmake.org/mailman/listinfo/cmake
[CMake] What folders does CHECK_INCLUDE_FILES look into?
Hi list, I'm wandering why a particular header file (pthread.h) is found by CMake on one platform, but not on another, though the header file is present in the same folder on both of them. There is no visible difference in how CMake is called, so how can this difference be explained? I had a look into the macro implementation, but couldn't spot an obvious difference. Best regards, Mathias -- 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://www.cmake.org/mailman/listinfo/cmake
[CMake] CMake 3.0-rc1 now ready for testing!
I am proud to announce that CMake 3.0 has entered the release candidate stage. Sources and binaries are available at: http://www.cmake.org/files/v3.0/?C=M;O=D Documentation is available at: http://www.cmake.org/cmake/help/v3.0 Release notes appear below and are also published at http://www.cmake.org/cmake/help/v3.0/release/3.0.0.html Some of the more significant features of CMake 3.0 are: * Compatibility options supporting code written for CMake versions prior to 2.4 have been removed. * The CMake language has been extended with *Bracket Argument* and *Bracket Comment* syntax inspired by Lua long brackets. * The CMake documentation has been converted to reStructuredText and uses Sphix generation. * Generators for Visual Studio 10 (2010) and later were renamed to include the product year like generators for older VS versions: * Visual Studio 10 - Visual Studio 10 2010 * Visual Studio 11 - Visual Studio 11 2012 * Visual Studio 12 - Visual Studio 12 2013 This clarifies which generator goes with each Visual Studio version. The old names are recognized for compatibility. * A new CodeLite extra generator is available for use with the Makefile or Ninja generators. * A new Kate extra generator is available for use with the Makefile or Ninja generators. * The add_library() command learned a new INTERFACE library type. Interface libraries have no build rules but may have properties defining usage requirements and may be installed, exported, and imported. This is useful to create header-only libraries that have concrete link dependencies on other libraries. * The export() command learned a new EXPORT mode that retrieves the list of targets to export from an export set configured by the install(TARGETS) command EXPORT option. This makes it easy to export from the build tree the same targets that are exported from the install tree. * The project() command learned to set some version variables to values specified by the new VERSION option or to empty strings. See policy CMP0048. * Several long-outdated commands that should no longer be called have been disallowed in new code by policies: * Policy CMP0029 disallows subdir_depends() * Policy CMP0030 disallows use_mangled_mesa() * Policy CMP0031 disallows load_command() * Policy CMP0032 disallows output_required_files() * Policy CMP0033 disallows export_library_dependencies() * Policy CMP0034 disallows utility_source() * Policy CMP0035 disallows variable_requires() * Policy CMP0036 disallows build_name() CMake 3.0.0 Release Notes * Changes made since CMake 2.8.12.2 include the following. Documentation Changes = * The CMake documentation has been converted to reStructuredText and now transforms via Sphinx (http://sphinx-doc.org) into man and html pages. This allows the documentation to be properly indexed and to contain cross-references. Conversion from the old internal documentation format was done by an automatic process so some documents may still contain artifacts. They will be updated incrementally over time. A basic reStructuredText processor has been implemented to support cmake --help-command and similar command-line options. * New manuals were added: * cmake-buildsystem(7) * cmake-commands(7), replacing cmakecommands(1) and cmakecompat(1) * cmake-developer(7) * cmake-generator-expressions(7) * cmake-generators(7) * cmake-language(7) * cmake-modules(7), replacing cmakemodules(1) * cmake-packages(7) * cmake-policies(7), replacing cmakepolicies(1) * cmake-properties(7), replacing cmakeprops(1) * cmake-qt(7) * cmake-toolchains(7) * cmake-variables(7), replacing cmakevars(1) * Release notes for CMake 3.0.0 and above will now be included with the html documentation. New Features Syntax -- * The CMake language has been extended with *Bracket Argument* and *Bracket Comment* syntax inspired by Lua long brackets: set(x [===[bracket argument]===] #[[bracket comment]]) Content between equal-length open- and close-brackets is taken literally with no variable replacements. Warning: This syntax change could not be made in a fully compatible way. No policy is possible because syntax parsing occurs before any chance to set a policy. Existing code using an unquoted argument that starts with an open bracket will be interpreted differently without any diagnostic. Fortunately the syntax is obscure enough that this problem is unlikely in practice. Generators -- * A new CodeLite extra generator is available for use with the Makefile or Ninja generators. * A new Kate extra generator is available for use with the Makefile or Ninja generators. * The Ninja generator learned to use ninja job pools when specified by a new JOB_POOLS global property. Commands * The add_library() command learned a new INTERFACE
Re: [CMake] Evaluating CMake for My Project, some questions
On Wednesday, February 26, 2014 22:16:34 peter.wri...@microchip.com wrote: I'm trying to see if CMake would be right for a project I'm working on. We're in need of a configuration tool but there are a few things that I'm not sure if CMake can do for us. 1. The first deals with the GUI for configuration. I'm wanting a fully nestable tree for the various sections. The 'Group' check box gives one level of nesting, but it doesn't seem to go farther than that first level, is it possible to get a deeper tree? I'm talking about haven't lots and lots of options. Kconfig looks to handle the sort of things we need in that area, but it's not the best solution since it requires a few too many things in the way things are set up just right. the current tree is simply based on common prefixes of the variables. This could be extended to more levels, if somebody puts work into it. 2. Which brings up the second part, there is the 'Advanced' check box. That will hide some options from the tree, and that's what I'm looking for, but is there any finer granularity possible than just on and off? Currently there is no way to do this. 3. Is there a way of getting more advanced option selection? There's binary check boxes, arbitrary strings and directories. Is there a way to put limits on integer selections, or drop down boxes of different options? You can use set_property(CACHE ... STRINGS option1;option2;...optinonN) to provide a combobox with a fixed set of options in cmake-gui. 4. How hard is it to add in a new IDE generator? CMake is missing netbeans, at least I can't find a way of selecting it, how hard would it be to add in Netbeans to CMake generation? The recommendations are to go This depends on the IDE and what kind of files need to be generated. Once added, it has to be maintained, which is usually quite some work. Alex -- 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://www.cmake.org/mailman/listinfo/cmake
[CMake] PROTECTED_AT: double encoding in CPack?
I'm getting errors like: error: File not found: /home/ian/atlassian/quipchat-installer/build64/quipchat-prefix/src/quipchat-build/_CPack_Packages/Linux/RPM/hipchat-2.1.60090-Linux/opt/HipChat/lib/QtQuick/Controls/Styles/Base/images/arrow-up@PROTECTED_AT @2x.png When generating an RPM with CPack. Which is true, that file doesn't exist, the filename is actually arrow...@2x.png. I found this bug: http://public.kitware.com/Bug/view.php?id=14063 Which seems to have introduced this PROTECTED_AT. Don't really understand how that patch was supposed to work. :) I'm building on Debian 7, which has RPM 4.11.1. Appears to be new enough. Thanks, Ian -- 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://www.cmake.org/mailman/listinfo/cmake
[CMake] CTest internally run tests in debugger
Hi! I have a bit of an odd request, but here goes. I have a situation where I get an intermittent failure in one of my nightly tests and it would be great if CTest could run the test in a debugger for me and I could attach to the process it ran to see what was going on. Is there anything existing that could do this? Right now I'm just pulling that test and running it in a self-made script that does that. Thanks! George -- 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://www.cmake.org/mailman/listinfo/cmake
[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1830-g9c9c50c
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 9c9c50c27112726a50cafc69b6ac83541981bc55 (commit)
via 57abfeaac55bd1b94c8e1f9f4d06f90910d86aa8 (commit)
via 165f6430d957173a0c3fda48265d8ed761700e20 (commit)
from a5c312be24e966f5b14367065a2e7b6109405f3a (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=9c9c50c27112726a50cafc69b6ac83541981bc55
commit 9c9c50c27112726a50cafc69b6ac83541981bc55
Merge: a5c312b 57abfea
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Feb 28 08:47:52 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Feb 28 08:47:52 2014 -0500
Merge topic 'FindRuby-2' into next
57abfeaa Help: Add FindRuby-2 topic release notes
165f6430 FindRuby: Add support for Ruby 2.0 and 2.1
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=57abfeaac55bd1b94c8e1f9f4d06f90910d86aa8
commit 57abfeaac55bd1b94c8e1f9f4d06f90910d86aa8
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Feb 28 08:47:12 2014 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Feb 28 08:47:12 2014 -0500
Help: Add FindRuby-2 topic release notes
diff --git a/Help/release/dev/FindRuby-2.rst b/Help/release/dev/FindRuby-2.rst
new file mode 100644
index 000..50d9a48
--- /dev/null
+++ b/Help/release/dev/FindRuby-2.rst
@@ -0,0 +1,4 @@
+FindRuby-2
+--
+
+* The :module:`FindRuby` module learned to search for Ruby 2.0 and 2.1.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=165f6430d957173a0c3fda48265d8ed761700e20
commit 165f6430d957173a0c3fda48265d8ed761700e20
Author: Bas Couwenberg sebas...@xs4all.nl
AuthorDate: Fri Feb 28 14:12:18 2014 +0100
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Feb 28 08:41:33 2014 -0500
FindRuby: Add support for Ruby 2.0 and 2.1
The most significant change since Ruby 1.9 is the changed path of
config.h, from RbConfig::CONFIG['rubyhdrdir'] to
RbConfig::CONFIG['rubyarchhdrdir'].
diff --git a/Modules/FindRuby.cmake b/Modules/FindRuby.cmake
index 9d9383d..aafdc09 100644
--- a/Modules/FindRuby.cmake
+++ b/Modules/FindRuby.cmake
@@ -5,7 +5,8 @@
# Find Ruby
#
# This module finds if Ruby is installed and determines where the
-# include files and libraries are. Ruby 1.8 and 1.9 are supported.
+# include files and libraries are. Ruby 1.8, 1.9, 2.0 and 2.1 are
+# supported.
#
# The minimum required version of Ruby can be specified using the
# standard syntax, e.g. find_package(Ruby 1.8)
@@ -67,6 +68,8 @@ else()
endif()
if(NOT Ruby_FIND_VERSION_EXACT)
+ list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.1 ruby21)
+ list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.0 ruby20)
list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby1.9 ruby19)
# if we want a version below 1.9, also look for ruby 1.8
@@ -79,7 +82,6 @@ endif()
find_program(RUBY_EXECUTABLE NAMES ${_RUBY_POSSIBLE_EXECUTABLE_NAMES})
-
if(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
function(_RUBY_CONFIG_VAR RBVAR OUTVAR)
execute_process(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e print
RbConfig::CONFIG['${RBVAR}']
@@ -105,6 +107,7 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
_RUBY_CONFIG_VAR(archdir RUBY_ARCH_DIR)
_RUBY_CONFIG_VAR(arch RUBY_ARCH)
_RUBY_CONFIG_VAR(rubyhdrdir RUBY_HDR_DIR)
+ _RUBY_CONFIG_VAR(rubyarchhdrdir RUBY_ARCHHDR_DIR)
_RUBY_CONFIG_VAR(libdir RUBY_POSSIBLE_LIB_DIR)
_RUBY_CONFIG_VAR(rubylibdir RUBY_RUBY_LIB_DIR)
@@ -126,7 +129,8 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
set(RUBY_VERSION_MINOR${RUBY_VERSION_MINOR}CACHE PATH The Ruby
minor version FORCE)
set(RUBY_VERSION_PATCH${RUBY_VERSION_PATCH}CACHE PATH The Ruby
patch version FORCE)
set(RUBY_ARCH_DIR ${RUBY_ARCH_DIR} CACHE PATH The Ruby
arch dir FORCE)
- set(RUBY_HDR_DIR ${RUBY_HDR_DIR} CACHE PATH The Ruby
header dir (1.9) FORCE)
+ set(RUBY_HDR_DIR ${RUBY_HDR_DIR} CACHE PATH The Ruby
header dir (1.9+) FORCE)
+ set(RUBY_ARCHHDR_DIR ${RUBY_ARCHHDR_DIR} CACHE PATH The Ruby
arch header dir (2.0+) FORCE)
set(RUBY_POSSIBLE_LIB_DIR ${RUBY_POSSIBLE_LIB_DIR} CACHE PATH The Ruby lib
dir FORCE)
set(RUBY_RUBY_LIB_DIR ${RUBY_RUBY_LIB_DIR} CACHE PATH The Ruby
ruby-lib dir FORCE)
set(RUBY_SITEARCH_DIR ${RUBY_SITEARCH_DIR} CACHE PATH The Ruby
site arch dir FORCE)
@@ -139,6 +143,7 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
RUBY_ARCH_DIR
RUBY_ARCH
RUBY_HDR_DIR
+ RUBY_ARCHHDR_DIR
RUBY_POSSIBLE_LIB_DIR
RUBY_RUBY_LIB_DIR
[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1832-g2889815
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 28898157851e68f13dc4267164c1815d0a28bab8 (commit)
via 4b67c4b94cc38814c4ff441b4a2f5cf792725485 (commit)
from 9c9c50c27112726a50cafc69b6ac83541981bc55 (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=28898157851e68f13dc4267164c1815d0a28bab8
commit 28898157851e68f13dc4267164c1815d0a28bab8
Merge: 9c9c50c 4b67c4b
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Fri Feb 28 08:56:13 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Feb 28 08:56:13 2014 -0500
Merge topic 'remove-compatibility-ctest' into next
4b67c4b9 Remove compatibility CTest code.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4b67c4b94cc38814c4ff441b4a2f5cf792725485
commit 4b67c4b94cc38814c4ff441b4a2f5cf792725485
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Fri Feb 28 14:52:40 2014 +0100
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Fri Feb 28 14:55:47 2014 +0100
Remove compatibility CTest code.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 761ad20..9e1e7c3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -164,8 +164,6 @@ macro(CMAKE_SETUP_TESTING)
${CMake_BINARY_DIR}/Modules/.NoDartCoverage)
configure_file(${CMake_SOURCE_DIR}/CTestCustom.cmake.in
${CMake_BINARY_DIR}/CTestCustom.cmake @ONLY)
- configure_file(${CMake_SOURCE_DIR}/CTestCustom.ctest.in
-${CMake_BINARY_DIR}/CTestCustom.ctest @ONLY)
if(BUILD_TESTING AND DART_ROOT)
configure_file(${CMake_SOURCE_DIR}/CMakeLogo.gif
${CMake_BINARY_DIR}/Testing/HTML/TestingResults/Icons/Logo.gif COPYONLY)
diff --git a/CTestConfig.cmake b/CTestConfig.cmake
index 92eacd8..819f9ba 100644
--- a/CTestConfig.cmake
+++ b/CTestConfig.cmake
@@ -18,8 +18,3 @@ set(CTEST_DROP_LOCATION /CDash/submit.php?project=CMake)
set(CTEST_DROP_SITE_CDASH TRUE)
set(CTEST_CDASH_VERSION 1.6)
set(CTEST_CDASH_QUERY_VERSION TRUE)
-
-# use old trigger stuff so that cmake 2.4 and below will not
-# get errors on trigger
-set (TRIGGER_SITE
- http://public.kitware.com/cgi-bin/Submit-CMake-TestingResults.cgi;)
diff --git a/CTestCustom.ctest.in b/CTestCustom.ctest.in
deleted file mode 100644
index 6127843..000
--- a/CTestCustom.ctest.in
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file is provided for compatibility with CMake 2.2 and lower.
-# Just include the custom file by its new name.
-INCLUDE(CTestCustom.cmake)
---
Summary of changes:
CMakeLists.txt |2 --
CTestConfig.cmake|5 -
CTestCustom.ctest.in |3 ---
3 files changed, 10 deletions(-)
delete mode 100644 CTestCustom.ctest.in
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1835-ge996c49
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 e996c49106589dc090a399b382cc3b034e146141 (commit)
via 4f8af97912107a298cca3048aa16ec2fce5becad (commit)
via ad28436798c68e0853e402b07d20eab5c496ac96 (commit)
from 28898157851e68f13dc4267164c1815d0a28bab8 (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=e996c49106589dc090a399b382cc3b034e146141
commit e996c49106589dc090a399b382cc3b034e146141
Merge: 2889815 4f8af97
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Fri Feb 28 08:57:18 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Feb 28 08:57:18 2014 -0500
Merge topic 'tests-alternative-generator' into next
4f8af979 Revert Tests: Pass the CTEST_MAKE_PROGRAM to the ExportImport
test.
ad284367 Revert Tests: Don't run fortran tests when using Ninja.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4f8af97912107a298cca3048aa16ec2fce5becad
commit 4f8af97912107a298cca3048aa16ec2fce5becad
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Fri Feb 28 14:56:51 2014 +0100
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Fri Feb 28 14:56:51 2014 +0100
Revert Tests: Pass the CTEST_MAKE_PROGRAM to the ExportImport test.
This reverts commit 47cee699ccad40cd861fdb213fc9908091b6849a.
diff --git a/Tests/ExportImport/CMakeLists.txt
b/Tests/ExportImport/CMakeLists.txt
index 77528aa..02a0371 100644
--- a/Tests/ExportImport/CMakeLists.txt
+++ b/Tests/ExportImport/CMakeLists.txt
@@ -45,7 +45,7 @@ add_custom_command(
--build-target install
--build-generator ${CMAKE_GENERATOR}
--build-generator-toolset ${CMAKE_GENERATOR_TOOLSET}
---build-options -C${ExportImport_BINARY_DIR}/InitialCache.cmake
-DCMAKE_MAKE_PROGRAM=${CMAKE_TEST_MAKEPROGRAM}
+--build-options -C${ExportImport_BINARY_DIR}/InitialCache.cmake
VERBATIM
)
add_custom_target(ExportTarget ALL DEPENDS
${ExportImport_BINARY_DIR}/ExportProject)
@@ -66,7 +66,7 @@ add_custom_command(
--build-project Import
--build-generator ${CMAKE_GENERATOR}
--build-generator-toolset ${CMAKE_GENERATOR_TOOLSET}
- --build-options -C${ExportImport_BINARY_DIR}/InitialCache.cmake
-DCMAKE_MAKE_PROGRAM=${CMAKE_TEST_MAKEPROGRAM}
+ --build-options -C${ExportImport_BINARY_DIR}/InitialCache.cmake
VERBATIM
)
add_custom_target(ImportTarget ALL DEPENDS
${ExportImport_BINARY_DIR}/ImportProject)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ad28436798c68e0853e402b07d20eab5c496ac96
commit ad28436798c68e0853e402b07d20eab5c496ac96
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Fri Feb 28 14:56:48 2014 +0100
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Fri Feb 28 14:56:48 2014 +0100
Revert Tests: Don't run fortran tests when using Ninja.
This reverts commit 5c75f99533d9e00197c63e7fa348cf921c49c825.
diff --git a/Tests/CheckFortran.cmake b/Tests/CheckFortran.cmake
index 79db360..ebbb426 100644
--- a/Tests/CheckFortran.cmake
+++ b/Tests/CheckFortran.cmake
@@ -12,12 +12,6 @@
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
-if (CMAKE_TEST_GENERATOR STREQUAL Ninja)
- # Ninja generator does not support Fortran.
- unset(CMAKE_Fortran_COMPILER CACHE)
- return()
-endif()
-
if(NOT DEFINED CMAKE_Fortran_COMPILER)
set(_desc Looking for a Fortran compiler)
message(STATUS ${_desc})
---
Summary of changes:
Tests/CheckFortran.cmake |6 --
Tests/ExportImport/CMakeLists.txt |4 ++--
2 files changed, 2 insertions(+), 8 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1837-g2904bdd
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 2904bdd55dd3014afea894caa91cca89e8c4bfee (commit)
via 00503d387e60cd4ecda07c05bd501f5bb8df4f07 (commit)
from e996c49106589dc090a399b382cc3b034e146141 (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=2904bdd55dd3014afea894caa91cca89e8c4bfee
commit 2904bdd55dd3014afea894caa91cca89e8c4bfee
Merge: e996c49 00503d3
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Feb 28 09:09:06 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Feb 28 09:09:06 2014 -0500
Merge topic 'watcom-dll-no-symbols' into next
00503d38 Watcom: Fix creation of DLLs without any exported symbols
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=00503d387e60cd4ecda07c05bd501f5bb8df4f07
commit 00503d387e60cd4ecda07c05bd501f5bb8df4f07
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Feb 27 16:22:28 2014 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Thu Feb 27 16:22:28 2014 -0500
Watcom: Fix creation of DLLs without any exported symbols
Create each DLL import library by passing option implib=... to the
linker for its SHARED library. This works even when there are no
symbols to be exported. Leave the option out for MODULE libraries
because we do not need an import library for them. For executables,
retain the separate invocation of wlib because we want an import
library only when the ENABLE_EXPORTS property is set, and in that
case the project should provide symbols.
Suggested-by: J Decker d3c...@gmail.com
diff --git a/Modules/Platform/Windows-wcl386.cmake
b/Modules/Platform/Windows-wcl386.cmake
index 8a03b29..d61ea47 100644
--- a/Modules/Platform/Windows-wcl386.cmake
+++ b/Modules/Platform/Windows-wcl386.cmake
@@ -65,11 +65,10 @@ set(CMAKE_C_CREATE_PREPROCESSED_SOURCE
set(CMAKE_CXX_CREATE_PREPROCESSED_SOURCE
CMAKE_CXX_COMPILER ${CMAKE_START_TEMP_FILE} ${CMAKE_WCL_QUIET} FLAGS
-dWIN32 -d+ DEFINES -foPREPROCESSED_SOURCE -pl -cc++
SOURCE${CMAKE_END_TEMP_FILE})
-set(CMAKE_CXX_CREATE_SHARED_MODULE
- wlink ${CMAKE_START_TEMP_FILE} system nt_dll ${CMAKE_WLINK_QUIET} name
'TARGET_UNQUOTED' LINK_FLAGS option caseexact file {OBJECTS}
LINK_LIBRARIES ${CMAKE_END_TEMP_FILE})
set(CMAKE_CXX_CREATE_SHARED_LIBRARY
- ${CMAKE_CXX_CREATE_SHARED_MODULE}
- ${CMAKE_CXX_CREATE_IMPORT_LIBRARY})
+ wlink ${CMAKE_START_TEMP_FILE} system nt_dll ${CMAKE_WLINK_QUIET} name
'TARGET_UNQUOTED' LINK_FLAGS option implib=TARGET_IMPLIB option caseexact
file {OBJECTS} LINK_LIBRARIES ${CMAKE_END_TEMP_FILE})
+string(REPLACE option implib=TARGET_IMPLIB
+ CMAKE_CXX_CREATE_SHARED_MODULE ${CMAKE_CXX_CREATE_SHARED_LIBRARY})
# create a C shared library
set(CMAKE_C_CREATE_SHARED_LIBRARY ${CMAKE_CXX_CREATE_SHARED_LIBRARY})
---
Summary of changes:
Modules/Platform/Windows-wcl386.cmake |7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1843-gde436a9
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 de436a9ba7fc380c15c0828db1f2469640e4a6e4 (commit)
via 0a6f0280672f3b1a638cae4cf5144c1adccef754 (commit)
from 731824fdb6b491554ec16f4544e221060748d75c (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=de436a9ba7fc380c15c0828db1f2469640e4a6e4
commit de436a9ba7fc380c15c0828db1f2469640e4a6e4
Merge: 731824f 0a6f028
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Feb 28 09:22:46 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Feb 28 09:22:46 2014 -0500
Merge topic 'no_gcov_error_msg' into next
0a6f0280 CTest: notify user if gcov cannot be found
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0a6f0280672f3b1a638cae4cf5144c1adccef754
commit 0a6f0280672f3b1a638cae4cf5144c1adccef754
Author: Zack Galbreath zack.galbre...@kitware.com
AuthorDate: Wed Feb 26 10:01:34 2014 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Feb 28 09:23:03 2014 -0500
CTest: notify user if gcov cannot be found
Emit an error message when we're performing coverage using
gcov and the gcov executable cannot be found.
diff --git a/Source/CTest/cmCTestCoverageHandler.cxx
b/Source/CTest/cmCTestCoverageHandler.cxx
index 3c65c55..0503d94 100644
--- a/Source/CTest/cmCTestCoverageHandler.cxx
+++ b/Source/CTest/cmCTestCoverageHandler.cxx
@@ -871,6 +871,12 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
{
std::string gcovCommand
= this-CTest-GetCTestConfiguration(CoverageCommand);
+ if (gcovCommand.empty())
+{
+cmCTestLog(this-CTest, ERROR_MESSAGE,
+ Could not find gcov. std::endl);
+return 0;
+}
std::string gcovExtraFlags
= this-CTest-GetCTestConfiguration(CoverageExtraFlags);
---
Summary of changes:
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1845-g2de024b
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 2de024b9abfa2a646fe9acd2ebe17badfe291b76 (commit) via 80aa18b4a88d83e630acf5655025b14af0c76475 (commit) from de436a9ba7fc380c15c0828db1f2469640e4a6e4 (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=2de024b9abfa2a646fe9acd2ebe17badfe291b76 commit 2de024b9abfa2a646fe9acd2ebe17badfe291b76 Merge: de436a9 80aa18b Author: Brad King brad.k...@kitware.com AuthorDate: Fri Feb 28 09:47:56 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Feb 28 09:47:56 2014 -0500 Merge topic 'FindPkgConfig-PKG_CONFIG' into next 80aa18b4 Help: Add release notes for topic 'FindPkgConfig-PKG_CONFIG' http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=80aa18b4a88d83e630acf5655025b14af0c76475 commit 80aa18b4a88d83e630acf5655025b14af0c76475 Author: Brad King brad.k...@kitware.com AuthorDate: Fri Feb 28 09:48:20 2014 -0500 Commit: Brad King brad.k...@kitware.com CommitDate: Fri Feb 28 09:48:20 2014 -0500 Help: Add release notes for topic 'FindPkgConfig-PKG_CONFIG' diff --git a/Help/release/dev/FindPkgConfig-PKG_CONFIG.rst b/Help/release/dev/FindPkgConfig-PKG_CONFIG.rst new file mode 100644 index 000..c0f6471 --- /dev/null +++ b/Help/release/dev/FindPkgConfig-PKG_CONFIG.rst @@ -0,0 +1,5 @@ +FindPkgConfig-PKG_CONFIG + + +* The :module:`FindPkgConfig` module learned to use the ``PKG_CONFIG`` + environment variable value as the ``pkg-config`` executable, if set. --- Summary of changes: Help/release/dev/FindPkgConfig-PKG_CONFIG.rst |5 + 1 file changed, 5 insertions(+) create mode 100644 Help/release/dev/FindPkgConfig-PKG_CONFIG.rst hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.12.2-1556-g244b769
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 244b7696ed8d6860b7524de79032becbf1568950 (commit) via 02a74a7d9f7bd7f8abc789c980a2ecca16471b51 (commit) from a3a178fcac3d141360da343e032ba6c40d2583ee (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=244b7696ed8d6860b7524de79032becbf1568950 commit 244b7696ed8d6860b7524de79032becbf1568950 Merge: a3a178f 02a74a7 Author: Brad King brad.k...@kitware.com AuthorDate: Fri Feb 28 09:48:25 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Feb 28 09:48:25 2014 -0500 Merge topic 'FindHg-add-WC_INFO' 02a74a7d Help: Add FindHg-WC_INFO topic release notes --- Summary of changes: Help/release/dev/FindHg-WC_INFO.rst |5 + 1 file changed, 5 insertions(+) create mode 100644 Help/release/dev/FindHg-WC_INFO.rst hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.12.2-1579-g937714c
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 937714c0370ab3d8f3aae1578c7e9f0329f56024 (commit) via 0f55f2547f45090d093a6f0871b107bf1fac4458 (commit) from a4656986e10b1e01ead2c416cc712a2581775636 (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=937714c0370ab3d8f3aae1578c7e9f0329f56024 commit 937714c0370ab3d8f3aae1578c7e9f0329f56024 Merge: a465698 0f55f25 Author: Brad King brad.k...@kitware.com AuthorDate: Fri Feb 28 09:48:41 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Feb 28 09:48:41 2014 -0500 Merge topic 'vs-Fortran-use-OBJECT-lib' 0f55f254 VS: For Intel Fortran .vfproj put OBJECT libs in link line (#14777) --- Summary of changes: Source/cmLocalVisualStudio7Generator.cxx |8 1 file changed, 4 insertions(+), 4 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.12.2-1558-g2a93843
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 2a93843f3f0d48278405f6a398dde3d4d280df44 (commit) via 755b378e57cf859b3dc28db004b8596e44d07175 (commit) from 244b7696ed8d6860b7524de79032becbf1568950 (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=2a93843f3f0d48278405f6a398dde3d4d280df44 commit 2a93843f3f0d48278405f6a398dde3d4d280df44 Merge: 244b769 755b378 Author: Brad King brad.k...@kitware.com AuthorDate: Fri Feb 28 09:48:27 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Feb 28 09:48:27 2014 -0500 Merge topic 'ExternalProject-BUILD_ALWAYS' 755b378e Help: Add ExternalProject-BUILD_ALWAYS topic release notes --- Summary of changes: Help/release/dev/ExternalProject-BUILD_ALWAYS.rst |6 ++ 1 file changed, 6 insertions(+) create mode 100644 Help/release/dev/ExternalProject-BUILD_ALWAYS.rst hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.12.2-1577-ga465698
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 a4656986e10b1e01ead2c416cc712a2581775636 (commit) via 7cd239ed38b2951e7fdd506d24a3f8e723e95b5f (commit) from eafd2a8511cc6e88db1c3f868d86a1cd57d47e9a (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=a4656986e10b1e01ead2c416cc712a2581775636 commit a4656986e10b1e01ead2c416cc712a2581775636 Merge: eafd2a8 7cd239e Author: Brad King brad.k...@kitware.com AuthorDate: Fri Feb 28 09:48:40 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Feb 28 09:48:40 2014 -0500 Merge topic 'tests-RunCMake-no-unused' 7cd239ed Tests/RunCMake: Tell cmake not to report unused command-line options --- Summary of changes: Tests/RunCMake/RunCMake.cmake |1 + 1 file changed, 1 insertion(+) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.12.2-1582-g451b55f
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 451b55f3ae25baa0230a4806bb02de270801bfd0 (commit)
via f0f2b21d52a0c3f1799c7747f0e7f5b52410054f (commit)
via 71b14dcb0ad52a65331268bf72808841786bc1d2 (commit)
from 937714c0370ab3d8f3aae1578c7e9f0329f56024 (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=451b55f3ae25baa0230a4806bb02de270801bfd0
commit 451b55f3ae25baa0230a4806bb02de270801bfd0
Merge: 937714c f0f2b21
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Feb 28 09:48:43 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Feb 28 09:48:43 2014 -0500
Merge topic 'release-aix-access'
f0f2b21d Utilities/Release: Update IBM AIX build machine access
71b14dcb Utilities/Release: Do not upload doc staging tarball
---
Summary of changes:
Utilities/Release/create-cmake-release.cmake |2 +-
.../{v20n250_aix_release.cmake = ibm_aix_release.cmake} | 13 +++--
Utilities/Release/release_cmake.cmake | 11 ---
Utilities/Release/release_cmake.sh.in |5 -
Utilities/Release/upload_release.cmake|6 +++---
5 files changed, 11 insertions(+), 26 deletions(-)
rename Utilities/Release/{v20n250_aix_release.cmake = ibm_aix_release.cmake}
(62%)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.12.2-1569-gf23cc1d
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 f23cc1d3d8a75b4406f61e24940d42758d3d663d (commit) via 0bba365ff5423fc51d574d17b7934e3a0148ac2e (commit) from 18646dd397d2c86b51118e16c62a89549bc1087d (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=f23cc1d3d8a75b4406f61e24940d42758d3d663d commit f23cc1d3d8a75b4406f61e24940d42758d3d663d Merge: 18646dd 0bba365 Author: Brad King brad.k...@kitware.com AuthorDate: Fri Feb 28 09:48:35 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Feb 28 09:48:35 2014 -0500 Merge topic 'test-find_dependency' 0bba365f Add test for find_dependency macro. --- Summary of changes: Tests/CMakeLists.txt |1 + Tests/Module/FindDependency/CMakeLists.txt| 10 ++ Tests/Module/FindDependency/main.cpp | 17 + .../FindDependency/packages/Pack1/Pack1Config.cmake |9 + .../packages/Pack1/Pack1ConfigVersion.cmake | 11 +++ .../FindDependency/packages/Pack2/Pack2Config.cmake |5 + .../packages/Pack2/Pack2ConfigVersion.cmake | 11 +++ .../FindDependency/packages/Pack3/Pack3Config.cmake |5 + .../packages/Pack3/Pack3ConfigVersion.cmake | 11 +++ 9 files changed, 80 insertions(+) create mode 100644 Tests/Module/FindDependency/CMakeLists.txt create mode 100644 Tests/Module/FindDependency/main.cpp create mode 100644 Tests/Module/FindDependency/packages/Pack1/Pack1Config.cmake create mode 100644 Tests/Module/FindDependency/packages/Pack1/Pack1ConfigVersion.cmake create mode 100644 Tests/Module/FindDependency/packages/Pack2/Pack2Config.cmake create mode 100644 Tests/Module/FindDependency/packages/Pack2/Pack2ConfigVersion.cmake create mode 100644 Tests/Module/FindDependency/packages/Pack3/Pack3Config.cmake create mode 100644 Tests/Module/FindDependency/packages/Pack3/Pack3ConfigVersion.cmake hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.12.2-1567-g18646dd
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 18646dd397d2c86b51118e16c62a89549bc1087d (commit) via b94ecab6d6540512df5e7c11deb9d168566d346f (commit) from 47896189aafc011b4a726716a9c5bc433b13edd6 (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=18646dd397d2c86b51118e16c62a89549bc1087d commit 18646dd397d2c86b51118e16c62a89549bc1087d Merge: 4789618 b94ecab Author: Brad King brad.k...@kitware.com AuthorDate: Fri Feb 28 09:48:34 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Feb 28 09:48:34 2014 -0500 Merge topic 'qt4-overlink' b94ecab6 FindQt4: prevent overlinking when using UseQt4.cmake. --- Summary of changes: Modules/UseQt4.cmake |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.12.2-1563-g27defbd
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 27defbd6d4547016a00a28098dab63bb95274c39 (commit) via 1b08e6095b71aff5cf16edda125fa28191264ec7 (commit) via 041485bc163c69e5eb2829bc78857a958cad7e87 (commit) from a2215197ff2358d1f8f6c803c04904993ccd5e56 (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=27defbd6d4547016a00a28098dab63bb95274c39 commit 27defbd6d4547016a00a28098dab63bb95274c39 Merge: a221519 1b08e60 Author: Brad King brad.k...@kitware.com AuthorDate: Fri Feb 28 09:48:30 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Feb 28 09:48:30 2014 -0500 Merge topic 'add-FindOpenCL' 1b08e609 Help: Add release notes for topic 'add-FindOpenCL' 041485bc Add FindOpenCL module --- Summary of changes: Help/manual/cmake-modules.7.rst |1 + Help/module/FindOpenCL.rst |1 + Help/release/dev/add-FindOpenCL.rst |4 ++ Modules/FindOpenCL.cmake| 134 +++ 4 files changed, 140 insertions(+) create mode 100644 Help/module/FindOpenCL.rst create mode 100644 Help/release/dev/add-FindOpenCL.rst create mode 100644 Modules/FindOpenCL.cmake hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.12.2-1565-g4789618
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 47896189aafc011b4a726716a9c5bc433b13edd6 (commit) via 0a6f0280672f3b1a638cae4cf5144c1adccef754 (commit) from 27defbd6d4547016a00a28098dab63bb95274c39 (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=47896189aafc011b4a726716a9c5bc433b13edd6 commit 47896189aafc011b4a726716a9c5bc433b13edd6 Merge: 27defbd 0a6f028 Author: Brad King brad.k...@kitware.com AuthorDate: Fri Feb 28 09:48:32 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Feb 28 09:48:32 2014 -0500 Merge topic 'no_gcov_error_msg' 0a6f0280 CTest: notify user if gcov cannot be found --- Summary of changes: Source/CTest/cmCTestCoverageHandler.cxx |6 ++ 1 file changed, 6 insertions(+) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.12.2-1575-geafd2a8
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 eafd2a8511cc6e88db1c3f868d86a1cd57d47e9a (commit) via 80aa18b4a88d83e630acf5655025b14af0c76475 (commit) via c53b5cd2215a25e0661cbaf88b22664d1ec09412 (commit) from e62102bef1c24c843e81e7c7da7a65c360afc7e3 (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=eafd2a8511cc6e88db1c3f868d86a1cd57d47e9a commit eafd2a8511cc6e88db1c3f868d86a1cd57d47e9a Merge: e62102b 80aa18b Author: Brad King brad.k...@kitware.com AuthorDate: Fri Feb 28 09:48:38 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Feb 28 09:48:38 2014 -0500 Merge topic 'FindPkgConfig-PKG_CONFIG' 80aa18b4 Help: Add release notes for topic 'FindPkgConfig-PKG_CONFIG' c53b5cd2 FindPkgConfig: Prefer PKG_CONFIG to find pkg-config (#13175) --- Summary of changes: Help/release/dev/FindPkgConfig-PKG_CONFIG.rst |5 + Modules/FindPkgConfig.cmake | 14 -- 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 Help/release/dev/FindPkgConfig-PKG_CONFIG.rst hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.12.2-1572-ge62102b
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 e62102bef1c24c843e81e7c7da7a65c360afc7e3 (commit) via ac42bca8330e0501d2fbf80dbe6d4d93234ba0c0 (commit) via c50325b8e55e55306fbf8bca38128303b82a51a9 (commit) from f23cc1d3d8a75b4406f61e24940d42758d3d663d (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=e62102bef1c24c843e81e7c7da7a65c360afc7e3 commit e62102bef1c24c843e81e7c7da7a65c360afc7e3 Merge: f23cc1d ac42bca Author: Brad King brad.k...@kitware.com AuthorDate: Fri Feb 28 09:48:36 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Feb 28 09:48:36 2014 -0500 Merge topic 'FindGTest-AUTO-SOURCES' ac42bca8 Help: Add FindGTest-AUTO-SOURCES topic release notes c50325b8 FindGTest: Optionally detect sources automatically (#14775) --- Summary of changes: Help/release/dev/FindGTest-AUTO-SOURCES.rst |7 +++ Modules/FindGTest.cmake |8 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 Help/release/dev/FindGTest-AUTO-SOURCES.rst hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.12.2-1560-ga221519
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 a2215197ff2358d1f8f6c803c04904993ccd5e56 (commit) via 6fcd835c0786182c4981f9f640849c5c91100845 (commit) from 2a93843f3f0d48278405f6a398dde3d4d280df44 (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=a2215197ff2358d1f8f6c803c04904993ccd5e56 commit a2215197ff2358d1f8f6c803c04904993ccd5e56 Merge: 2a93843 6fcd835 Author: Brad King brad.k...@kitware.com AuthorDate: Fri Feb 28 09:48:28 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Feb 28 09:48:28 2014 -0500 Merge topic 'wix-refactor' 6fcd835c CPackWIX: refactor and cleanup --- Summary of changes: Source/CMakeLists.txt |4 + Source/CPack/WiX/cmCPackWIXGenerator.cxx | 577 +--- Source/CPack/WiX/cmCPackWIXGenerator.h | 103 ++-- Source/CPack/WiX/cmWIXDirectoriesSourceWriter.cxx | 87 +++ Source/CPack/WiX/cmWIXDirectoriesSourceWriter.h| 42 ++ Source/CPack/WiX/cmWIXFeaturesSourceWriter.cxx | 102 Source/CPack/WiX/cmWIXFeaturesSourceWriter.h | 39 ++ Source/CPack/WiX/cmWIXFilesSourceWriter.cxx| 149 + Source/CPack/WiX/cmWIXFilesSourceWriter.h | 62 +++ Source/CPack/WiX/cmWIXPatch.cxx| 91 +++ Source/CPack/WiX/cmWIXPatch.h | 45 ++ Source/CPack/WiX/cmWIXPatchParser.cxx |2 +- Source/CPack/WiX/cmWIXPatchParser.h|2 +- Source/CPack/WiX/cmWIXRichTextFormatWriter.cxx |8 +- Source/CPack/WiX/cmWIXRichTextFormatWriter.h |8 +- .../blub.h = Source/CPack/WiX/cmWIXShortcut.h | 21 +- Source/CPack/WiX/cmWIXSourceWriter.cxx | 14 +- Source/CPack/WiX/cmWIXSourceWriter.h | 16 +- 18 files changed, 829 insertions(+), 543 deletions(-) create mode 100644 Source/CPack/WiX/cmWIXDirectoriesSourceWriter.cxx create mode 100644 Source/CPack/WiX/cmWIXDirectoriesSourceWriter.h create mode 100644 Source/CPack/WiX/cmWIXFeaturesSourceWriter.cxx create mode 100644 Source/CPack/WiX/cmWIXFeaturesSourceWriter.h create mode 100644 Source/CPack/WiX/cmWIXFilesSourceWriter.cxx create mode 100644 Source/CPack/WiX/cmWIXFilesSourceWriter.h create mode 100644 Source/CPack/WiX/cmWIXPatch.cxx create mode 100644 Source/CPack/WiX/cmWIXPatch.h copy Tests/QtAutogen/blub.h = Source/CPack/WiX/cmWIXShortcut.h (67%) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1859-g7d525d2
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 7d525d27da34d4cc2b601c92b470b354941fa108 (commit) via 451b55f3ae25baa0230a4806bb02de270801bfd0 (commit) via 937714c0370ab3d8f3aae1578c7e9f0329f56024 (commit) via a4656986e10b1e01ead2c416cc712a2581775636 (commit) via eafd2a8511cc6e88db1c3f868d86a1cd57d47e9a (commit) via e62102bef1c24c843e81e7c7da7a65c360afc7e3 (commit) via f23cc1d3d8a75b4406f61e24940d42758d3d663d (commit) via 18646dd397d2c86b51118e16c62a89549bc1087d (commit) via 47896189aafc011b4a726716a9c5bc433b13edd6 (commit) via 27defbd6d4547016a00a28098dab63bb95274c39 (commit) via a2215197ff2358d1f8f6c803c04904993ccd5e56 (commit) via 2a93843f3f0d48278405f6a398dde3d4d280df44 (commit) via 244b7696ed8d6860b7524de79032becbf1568950 (commit) via a3a178fcac3d141360da343e032ba6c40d2583ee (commit) from 2de024b9abfa2a646fe9acd2ebe17badfe291b76 (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=7d525d27da34d4cc2b601c92b470b354941fa108 commit 7d525d27da34d4cc2b601c92b470b354941fa108 Merge: 2de024b 451b55f Author: Brad King brad.k...@kitware.com AuthorDate: Fri Feb 28 09:49:48 2014 -0500 Commit: Brad King brad.k...@kitware.com CommitDate: Fri Feb 28 09:49:48 2014 -0500 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/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1869-gab463b4
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 ab463b4341377f38d9b9dee39386535b6f0b7d9a (commit) via 0f309aa9f246fbc9ba6b9625daba8b8b3100c5b6 (commit) from 965e8cc2d8f9434cfde914c5c4e2ebf5fa01dfd6 (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=ab463b4341377f38d9b9dee39386535b6f0b7d9a commit ab463b4341377f38d9b9dee39386535b6f0b7d9a Merge: 965e8cc 0f309aa Author: Stephen Kelly steve...@gmail.com AuthorDate: Fri Feb 28 11:50:01 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Feb 28 11:50:01 2014 -0500 Merge topic 'alt-test-generator' into next 0f309aa9 Fix up the CompilerChange test. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0f309aa9f246fbc9ba6b9625daba8b8b3100c5b6 commit 0f309aa9f246fbc9ba6b9625daba8b8b3100c5b6 Author: Stephen Kelly steve...@gmail.com AuthorDate: Fri Feb 28 17:48:38 2014 +0100 Commit: Stephen Kelly steve...@gmail.com CommitDate: Fri Feb 28 17:48:38 2014 +0100 Fix up the CompilerChange test. diff --git a/Tests/RunCMake/CompilerChange/FirstCompiler-stdout.txt b/Tests/RunCMake/CompilerChange/FirstCompiler-stdout.txt index 17621b7..bc668e8 100644 --- a/Tests/RunCMake/CompilerChange/FirstCompiler-stdout.txt +++ b/Tests/RunCMake/CompilerChange/FirstCompiler-stdout.txt @@ -1 +1 @@ --- CMAKE_C_COMPILER is .*/Tests/RunCMake/CompilerChange/cc1.sh +-- CMAKE_C_COMPILER is .*Tests/RunCMake/CompilerChange/cc1.sh diff --git a/Tests/RunCMake/CompilerChange/SecondCompiler-stderr.txt b/Tests/RunCMake/CompilerChange/SecondCompiler-stderr.txt index 3a01c53..692fe2c 100644 --- a/Tests/RunCMake/CompilerChange/SecondCompiler-stderr.txt +++ b/Tests/RunCMake/CompilerChange/SecondCompiler-stderr.txt @@ -1,4 +1,4 @@ You have changed variables that require your cache to be deleted. Configure will be re-run and you may have to reset some variables. The following variables have changed: -CMAKE_C_COMPILER=.*/Tests/RunCMake/CompilerChange/cc2.sh +CMAKE_C_COMPILER=.*Tests/RunCMake/CompilerChange/cc2.sh diff --git a/Tests/RunCMake/CompilerChange/SecondCompiler-stdout.txt b/Tests/RunCMake/CompilerChange/SecondCompiler-stdout.txt index 26ca964..2da017c 100644 --- a/Tests/RunCMake/CompilerChange/SecondCompiler-stdout.txt +++ b/Tests/RunCMake/CompilerChange/SecondCompiler-stdout.txt @@ -1 +1 @@ --- CMAKE_C_COMPILER is .*/Tests/RunCMake/CompilerChange/cc2.sh +-- CMAKE_C_COMPILER is .*Tests/RunCMake/CompilerChange/cc2.sh --- Summary of changes: Tests/RunCMake/CompilerChange/FirstCompiler-stdout.txt |2 +- Tests/RunCMake/CompilerChange/SecondCompiler-stderr.txt |2 +- Tests/RunCMake/CompilerChange/SecondCompiler-stdout.txt |2 +- 3 files changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1878-ge71cffd
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 e71cffd131ec556fdb695ff32698a86fa0289dfb (commit)
via 5c5be193cf86f86fb6e9c0c0bd4f01eb1dfa8d08 (commit)
from 5a92c9e34fed3dfa47f924da0f9495f662021642 (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=e71cffd131ec556fdb695ff32698a86fa0289dfb
commit e71cffd131ec556fdb695ff32698a86fa0289dfb
Merge: 5a92c9e 5c5be19
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Feb 28 13:44:18 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Feb 28 13:44:18 2014 -0500
Merge topic 'watcom-wlib-quoting' into next
5c5be193 Watcom: Fix static library name quoting for wlib
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5c5be193cf86f86fb6e9c0c0bd4f01eb1dfa8d08
commit 5c5be193cf86f86fb6e9c0c0bd4f01eb1dfa8d08
Author: Jiri Malak malak.j...@gmail.com
AuthorDate: Fri Feb 28 18:21:52 2014 +0100
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Feb 28 13:34:59 2014 -0500
Watcom: Fix static library name quoting for wlib
Use double-quotes instead of single-quotes around the static library
target name in 'wlib' invocations.
diff --git a/Modules/Platform/Windows-wcl386.cmake
b/Modules/Platform/Windows-wcl386.cmake
index 8a03b29..2d5050a 100644
--- a/Modules/Platform/Windows-wcl386.cmake
+++ b/Modules/Platform/Windows-wcl386.cmake
@@ -40,7 +40,7 @@ set (CMAKE_C_STANDARD_LIBRARIES_INIT library clbrdll.lib
library plbrdll.lib l
set (CMAKE_CXX_STANDARD_LIBRARIES_INIT ${CMAKE_C_STANDARD_LIBRARIES_INIT})
set(CMAKE_C_CREATE_IMPORT_LIBRARY
- wlib -c -q -n -b TARGET_IMPLIB +'TARGET_UNQUOTED')
+ wlib -c -q -n -b TARGET_IMPLIB +TARGET_QUOTED)
set(CMAKE_CXX_CREATE_IMPORT_LIBRARY ${CMAKE_C_CREATE_IMPORT_LIBRARY})
set(CMAKE_C_LINK_EXECUTABLE
@@ -78,7 +78,7 @@ set(CMAKE_C_CREATE_SHARED_LIBRARY
${CMAKE_CXX_CREATE_SHARED_LIBRARY})
set(CMAKE_C_CREATE_SHARED_MODULE ${CMAKE_CXX_CREATE_SHARED_MODULE})
# create a C++ static library
-set(CMAKE_CXX_CREATE_STATIC_LIBRARY wlib ${CMAKE_LIB_QUIET} -c -n -b
'TARGET_UNQUOTED' LINK_FLAGS OBJECTS )
+set(CMAKE_CXX_CREATE_STATIC_LIBRARY wlib ${CMAKE_LIB_QUIET} -c -n -b
TARGET_QUOTED LINK_FLAGS OBJECTS )
# create a C static library
set(CMAKE_C_CREATE_STATIC_LIBRARY ${CMAKE_CXX_CREATE_STATIC_LIBRARY})
---
Summary of changes:
Modules/Platform/Windows-wcl386.cmake |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1882-g276f1c3
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 276f1c3e1a318769321e4997b00b0b2817bcac38 (commit)
via cba43d929f71aa7fdf673a47f2313d6324102d79 (commit)
via 29a9047ba3ab3fdbfb45cafa79ff295994b91e8d (commit)
via 3c47cb460d9801a89345cddca2c98bf622720286 (commit)
from e71cffd131ec556fdb695ff32698a86fa0289dfb (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=276f1c3e1a318769321e4997b00b0b2817bcac38
commit 276f1c3e1a318769321e4997b00b0b2817bcac38
Merge: e71cffd cba43d9
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Fri Feb 28 14:08:09 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Feb 28 14:08:09 2014 -0500
Merge topic 'alt-test-generator' into next
cba43d92 Move the invocation of the CMAKE_SETUP_TESTING macro.
29a9047b Revert Tests: Don't expect the Tests dir to be called 'Tests'.
3c47cb46 Put tests in a subdir.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cba43d929f71aa7fdf673a47f2313d6324102d79
commit cba43d929f71aa7fdf673a47f2313d6324102d79
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Fri Feb 28 20:03:23 2014 +0100
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Fri Feb 28 20:03:23 2014 +0100
Move the invocation of the CMAKE_SETUP_TESTING macro.
Ensure that the CMAKE_TEST_GENERATOR is populated early.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b25c58..c0084c1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -427,6 +427,8 @@ set(LIBRARY_OUTPUT_PATH CACHE INTERNAL
# install tree.
set(CMAKE_SKIP_RPATH ON CACHE INTERNAL CMake does not need RPATHs.)
+CMAKE_SETUP_TESTING()
+
# Load install destinations.
include(Source/CMakeInstallDestinations.cmake)
@@ -537,7 +539,6 @@ add_custom_target(uninstall
include (CMakeCPack.cmake)
# setup some Testing support (a macro defined in this file)
-CMAKE_SETUP_TESTING()
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/DartLocal.conf.in
${CMAKE_CURRENT_BINARY_DIR}/DartLocal.conf
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=29a9047ba3ab3fdbfb45cafa79ff295994b91e8d
commit 29a9047ba3ab3fdbfb45cafa79ff295994b91e8d
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Fri Feb 28 19:54:22 2014 +0100
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Fri Feb 28 19:57:06 2014 +0100
Revert Tests: Don't expect the Tests dir to be called 'Tests'.
This reverts commit cfb566a620939b9d260f58347651de0a108b7237.
diff --git a/Tests/RunCMake/CMP0041/CMP0041-NEW-stderr.txt
b/Tests/RunCMake/CMP0041/CMP0041-NEW-stderr.txt
index d6d78ee..2ec3aef 100644
--- a/Tests/RunCMake/CMP0041/CMP0041-NEW-stderr.txt
+++ b/Tests/RunCMake/CMP0041/CMP0041-NEW-stderr.txt
@@ -15,6 +15,6 @@ CMake Error in CMakeLists.txt:
CMake Error in CMakeLists.txt:
Target foo INTERFACE_INCLUDE_DIRECTORIES property contains path:
-
.*Tests/RunCMake/CMP0041/CMP0041-NEW-build/include/\$TARGET_PROPERTY:NAME
+
.*/Tests/RunCMake/CMP0041/CMP0041-NEW-build/include/\$TARGET_PROPERTY:NAME
which is prefixed in the build directory.
diff --git a/Tests/RunCMake/CMP0041/CMP0041-WARN-stderr.txt
b/Tests/RunCMake/CMP0041/CMP0041-WARN-stderr.txt
index 6bc501f..a7d303e 100644
--- a/Tests/RunCMake/CMP0041/CMP0041-WARN-stderr.txt
+++ b/Tests/RunCMake/CMP0041/CMP0041-WARN-stderr.txt
@@ -27,6 +27,6 @@ CMake Warning in CMakeLists.txt:
Target foo INTERFACE_INCLUDE_DIRECTORIES property contains path:
-
.*Tests/RunCMake/CMP0041/CMP0041-WARN-build/include/\$TARGET_PROPERTY:NAME
+
.*/Tests/RunCMake/CMP0041/CMP0041-WARN-build/include/\$TARGET_PROPERTY:NAME
which is prefixed in the build directory.
diff --git a/Tests/RunCMake/CMP0041/CMP0041-tid-NEW-stderr.txt
b/Tests/RunCMake/CMP0041/CMP0041-tid-NEW-stderr.txt
index 4df4b5c..9b0a214 100644
--- a/Tests/RunCMake/CMP0041/CMP0041-tid-NEW-stderr.txt
+++ b/Tests/RunCMake/CMP0041/CMP0041-tid-NEW-stderr.txt
@@ -17,6 +17,6 @@ CMake Error in CMakeLists.txt:
CMake Error in CMakeLists.txt:
Target foo INTERFACE_INCLUDE_DIRECTORIES property contains path:
-
.*Tests/RunCMake/CMP0041/CMP0041-tid-NEW-build/include/\$TARGET_PROPERTY:NAME
+
.*/Tests/RunCMake/CMP0041/CMP0041-tid-NEW-build/include/\$TARGET_PROPERTY:NAME
which is prefixed in the build directory.
diff --git a/Tests/RunCMake/CMP0041/CMP0041-tid-WARN-stderr.txt
b/Tests/RunCMake/CMP0041/CMP0041-tid-WARN-stderr.txt
index bbc1ae9..aae2c7a 100644
--- a/Tests/RunCMake/CMP0041/CMP0041-tid-WARN-stderr.txt
+++ b/Tests/RunCMake/CMP0041/CMP0041-tid-WARN-stderr.txt
@@ -29,6 +29,6 @@ CMake Warning in CMakeLists.txt:
Target foo
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-397-ga377ba7
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 a377ba7bb9c90ec0e811175842c3c69991647849 (commit)
via d92dd482ae06a0df8934b32f4ecad9bbf4254894 (commit)
from 33760f8c6a480864559e2294a776b263d20745ad (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=a377ba7bb9c90ec0e811175842c3c69991647849
commit a377ba7bb9c90ec0e811175842c3c69991647849
Merge: 33760f8 d92dd48
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Fri Feb 28 15:04:03 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Feb 28 15:04:03 2014 -0500
Merge topic 'alt-test-generator' into next
d92dd482 Move some test related code around.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d92dd482ae06a0df8934b32f4ecad9bbf4254894
commit d92dd482ae06a0df8934b32f4ecad9bbf4254894
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Fri Feb 28 21:03:33 2014 +0100
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Fri Feb 28 21:03:33 2014 +0100
Move some test related code around.
Maybe this fixes the dashboards.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c0084c1..06277a1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -427,28 +427,10 @@ set(LIBRARY_OUTPUT_PATH CACHE INTERNAL
# install tree.
set(CMAKE_SKIP_RPATH ON CACHE INTERNAL CMake does not need RPATHs.)
-CMAKE_SETUP_TESTING()
# Load install destinations.
include(Source/CMakeInstallDestinations.cmake)
-if (NOT CMAKE_TEST_GENERATOR STREQUAL CMAKE_GENERATOR
-OR NOT CMAKE_TEST_GENERATOR_TOOLSET STREQUAL CMAKE_GENERATOR_TOOLSET)
- set(CMake_TestAlternative ${CMAKE_TEST_GENERATOR})
- if (CMAKE_TEST_GENERATOR_TOOLSET)
-set(CMake_TestAlternative
${CMake_TestAlternative}_${CMAKE_TEST_GENERATOR_TOOLSET})
- endif()
- if (NOT CMAKE_VERSION VERSION_LESS 2.8.12)
-string(MAKE_C_IDENTIFIER ${CMake_TestAlternative} CMake_TestAlternative)
- endif()
- set(CMake_TestAlternative ${CMake_TestAlternative}/)
-endif()
-set(CMake_TestDir ${CMake_TestAlternative}Tests)
-
-if(BUILD_TESTING)
- include(${CMake_SOURCE_DIR}/Tests/CMakeInstall.cmake)
-endif()
-
# include special compile flags for some compilers
include(CompileFlags.cmake)
@@ -539,6 +521,24 @@ add_custom_target(uninstall
include (CMakeCPack.cmake)
# setup some Testing support (a macro defined in this file)
+CMAKE_SETUP_TESTING()
+if (NOT CMAKE_TEST_GENERATOR STREQUAL CMAKE_GENERATOR
+OR NOT CMAKE_TEST_GENERATOR_TOOLSET STREQUAL CMAKE_GENERATOR_TOOLSET)
+ set(CMake_TestAlternative ${CMAKE_TEST_GENERATOR})
+ if (CMAKE_TEST_GENERATOR_TOOLSET)
+set(CMake_TestAlternative
${CMake_TestAlternative}_${CMAKE_TEST_GENERATOR_TOOLSET})
+ endif()
+ if (NOT CMAKE_VERSION VERSION_LESS 2.8.12)
+string(MAKE_C_IDENTIFIER ${CMake_TestAlternative} CMake_TestAlternative)
+ endif()
+ set(CMake_TestAlternative ${CMake_TestAlternative}/)
+endif()
+set(CMake_TestDir ${CMake_TestAlternative}Tests)
+
+if(BUILD_TESTING)
+ include(${CMake_SOURCE_DIR}/Tests/CMakeInstall.cmake)
+endif()
+
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/DartLocal.conf.in
${CMAKE_CURRENT_BINARY_DIR}/DartLocal.conf
---
Summary of changes:
CMakeLists.txt | 36 ++--
1 file changed, 18 insertions(+), 18 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-401-g882f27a
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 882f27a57b2b069925790ec2228cffb8307268c5 (commit)
via d69ff942b4f4283ce66692d5b9275eed9ea0288f (commit)
via d0835f87d5c634035601283fc11158b113faafd2 (commit)
via c02b4f002a3aa5e78e97a04482a5a55b4b99c4bc (commit)
from a377ba7bb9c90ec0e811175842c3c69991647849 (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=882f27a57b2b069925790ec2228cffb8307268c5
commit 882f27a57b2b069925790ec2228cffb8307268c5
Merge: a377ba7 d69ff94
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Fri Feb 28 15:13:05 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Feb 28 15:13:05 2014 -0500
Merge topic 'alt-test-generator' into next
d69ff942 Revert Move the invocation of the CMAKE_SETUP_TESTING macro.
d0835f87 Revert Tests: Build alt-test-generator tests in a separate binary
dir.
c02b4f00 Revert Move some test related code around.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d69ff942b4f4283ce66692d5b9275eed9ea0288f
commit d69ff942b4f4283ce66692d5b9275eed9ea0288f
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Fri Feb 28 21:12:43 2014 +0100
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Fri Feb 28 21:12:43 2014 +0100
Revert Move the invocation of the CMAKE_SETUP_TESTING macro.
This reverts commit 4746a1d8257e2663845ec952c0faf9e6689d29ae.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c5808e..761ad20 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -427,8 +427,6 @@ set(LIBRARY_OUTPUT_PATH CACHE INTERNAL
# install tree.
set(CMAKE_SKIP_RPATH ON CACHE INTERNAL CMake does not need RPATHs.)
-CMAKE_SETUP_TESTING()
-
# Load install destinations.
include(Source/CMakeInstallDestinations.cmake)
@@ -526,6 +524,7 @@ add_custom_target(uninstall
include (CMakeCPack.cmake)
# setup some Testing support (a macro defined in this file)
+CMAKE_SETUP_TESTING()
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/DartLocal.conf.in
${CMAKE_CURRENT_BINARY_DIR}/DartLocal.conf
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d0835f87d5c634035601283fc11158b113faafd2
commit d0835f87d5c634035601283fc11158b113faafd2
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Fri Feb 28 21:12:39 2014 +0100
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Fri Feb 28 21:12:39 2014 +0100
Revert Tests: Build alt-test-generator tests in a separate binary dir.
This reverts commit 727f4badde1a74652b20ea775277bf968e72b8d1.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c0084c1..6c5808e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -432,19 +432,6 @@ CMAKE_SETUP_TESTING()
# Load install destinations.
include(Source/CMakeInstallDestinations.cmake)
-if (NOT CMAKE_TEST_GENERATOR STREQUAL CMAKE_GENERATOR
-OR NOT CMAKE_TEST_GENERATOR_TOOLSET STREQUAL CMAKE_GENERATOR_TOOLSET)
- set(CMake_TestAlternative ${CMAKE_TEST_GENERATOR})
- if (CMAKE_TEST_GENERATOR_TOOLSET)
-set(CMake_TestAlternative
${CMake_TestAlternative}_${CMAKE_TEST_GENERATOR_TOOLSET})
- endif()
- if (NOT CMAKE_VERSION VERSION_LESS 2.8.12)
-string(MAKE_C_IDENTIFIER ${CMake_TestAlternative} CMake_TestAlternative)
- endif()
- set(CMake_TestAlternative ${CMake_TestAlternative}/)
-endif()
-set(CMake_TestDir ${CMake_TestAlternative}Tests)
-
if(BUILD_TESTING)
include(${CMake_SOURCE_DIR}/Tests/CMakeInstall.cmake)
endif()
@@ -571,10 +558,10 @@ endif()
# build the remaining subdirectories
add_subdirectory(Source)
add_subdirectory(Utilities)
-add_subdirectory(Tests ${CMake_TestDir})
+add_subdirectory(Tests)
if(BUILD_TESTING)
- CMAKE_SET_TARGET_FOLDER(CMakeLibTests ${CMake_TestDir})
+ CMAKE_SET_TARGET_FOLDER(CMakeLibTests Tests)
endif()
CMAKE_SET_TARGET_FOLDER(cmw9xcom Utilities/Win9xCompat)
if(TARGET documentation)
diff --git a/Tests/CMakeInstall.cmake b/Tests/CMakeInstall.cmake
index 3c2135c..fda8c54 100644
--- a/Tests/CMakeInstall.cmake
+++ b/Tests/CMakeInstall.cmake
@@ -11,7 +11,7 @@ if(CMake_TEST_INSTALL)
set(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY 1)
# Install to a test directory.
- set(CMake_TEST_INSTALL_PREFIX
${CMake_BINARY_DIR}/${CMake_TestDir}/CMakeInstall)
+ set(CMake_TEST_INSTALL_PREFIX ${CMake_BINARY_DIR}/Tests/CMakeInstall)
set(CMAKE_INSTALL_PREFIX ${CMake_TEST_INSTALL_PREFIX})
if(CMAKE_CONFIGURATION_TYPES)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c02b4f002a3aa5e78e97a04482a5a55b4b99c4bc
commit c02b4f002a3aa5e78e97a04482a5a55b4b99c4bc
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Fri Feb 28 21:12:36 2014 +0100
Commit:
[Cmake-commits] CMake branch, master, updated. v3.0.0-rc1-89-gc0afb88
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 c0afb8867518e7b7ef17d5ce90f1a99051d2fd14 (commit) from 451b55f3ae25baa0230a4806bb02de270801bfd0 (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=c0afb8867518e7b7ef17d5ce90f1a99051d2fd14 commit c0afb8867518e7b7ef17d5ce90f1a99051d2fd14 Author: Kitware Robot kwro...@kitware.com AuthorDate: Sat Mar 1 00:01:10 2014 -0500 Commit: Kitware Robot kwro...@kitware.com CommitDate: Sat Mar 1 00:01:10 2014 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index ccc5183..3afaf52 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 20140228) +set(CMake_VERSION_PATCH 20140301) #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/cgi-bin/mailman/listinfo/cmake-commits
