Re: [cmake-developers] User vs CMake include mismatch handling
On Tuesday 23 November 2010, Alexander Neundorf wrote: On Tuesday 23 November 2010, Brad King wrote: On 11/23/2010 03:31 PM, Alexander Neundorf wrote: On Monday 22 November 2010, Brad King wrote: On 11/22/2010 04:06 PM, Alexander Neundorf wrote: On Monday 22 November 2010, Brad King wrote: (1) Improve documentation of CMAKE_USER_MAKE_RULES_OVERRIDE[_C] variables (2) Add the Custom-* file inclusion, document it Could you take care of (1) ? Sure, but not until at least next week. The changes don't need to be done in this order anyway. Ok :-) I'll start with the CMAKE_POLICY_DEFAULT_CMP stuff you suggested. I merged this now into next on stage. It contains: - the new policy CMP0017 - the feature to set the default via CMAKE_POLICY_DEFAULT_CMP - a basic test - some documentation Please have a look at it. Alex ___ cmake-developers mailing list cmake-developers@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
[CMake] Visual Studio project layout
Hi all, I'm trying to reduce the number of toplevel projects in my CMake generated Visual Studio solution. The idea is to group some targets in solution paths. The layout should look like this: Solution - Target 1 - Foo + Target 2 + Target 3 - Target 4 ... Is there a way to achieve this with CMake? Best regards, Andreas ___ 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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Cross-compiling, CMAKE_C_FLAGS, and configure-time compiler tests
Hi Justin,
I'm very unsure if this is the correct solution, but it worked for me. I
haven't been able to find any good documentation stating how the CMakeCache
interacts with other parts of CMake.
My assumption is that since CMAKE_C{XX}_FLAGS is supposed to allow the user
to set optional compilation flags, it prefers the value in the cache versus
the one from the toolchain file.
From one of my toolchain files, reproduce as necessary for CMAKE_C_FLAGS:
SET(CMAKE_CXX_FLAGS ${CMAKE_C_FLAGS} -fno-rtti CACHE STRING FORCE)
Cheers
/Johan
On Mon, Dec 13, 2010 at 4:49 PM, Justin Holewinski
justin.holewin...@gmail.com wrote:
I am experiencing a cross-compiling issue that I believe is related to how
toolchain files interact with the configure-time compiler checks. For
reference, I am targeting the iOS 4.2 SDK. I have a toolchain file that
sets CMAKE_C_FLAGS, CMAKE_CXX_FLAGS, CMAKE_C_LINK_FLAGS, and
CMAKE_CXX_LINK_FLAGS with appropriate flags for the iOS platform, in
particular -arch armv6 -arch armv7. The toolchain file also sets the
proper C and C++ compilers.
When CMake is executed and the C compiler is tested, the
toolchain-specified compiler arguments are passed to the link line, but
*not* the compile line (according to the error output). Since the compile
line does not contain the -arch arguments, the generated object file is
for i386. However, since the link line contains these flags, the linker
tries to link ARM code and fails.
Are there any additional variables I should be setting in addition to
CMAKE_C_FLAGS and CMAKE_CXX_FLAGS in order to get the compiler tests to use
the right flags? If I add the -arch flags using ADD_DEFINITIONS(), they
are passed to the compiler test and it succeeds. That seems like a hack and
not a proper solution, though.
Below is the CMake output that prints the values of CMAKE_*_FLAGS as set by
the toolchain file, as well as the compile and link lines used by CMake.
I am using CMake 2.8.3 on Snow Leopard 10.6.5.
CMake Output:
-- CMAKE_C_FLAGS:-arch armv6 -arch armv7 -pipe -no-cpp-precomp
--sysroot=/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.2.sdk
-miphoneos-version-min=4.2
-- CMAKE_CXX_FLAGS -arch armv6 -arch armv7 -pipe -no-cpp-precomp
--sysroot=/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.2.sdk
-miphoneos-version-min=4.2
-- CMAKE_C_LINK_FLAGS-arch armv6 -arch armv7 -pipe -no-cpp-precomp
--sysroot=/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.2.sdk
-miphoneos-version-min=4.2
-- CMAKE_CXX_LINK_FLAGS -arch armv6 -arch armv7 -pipe -no-cpp-precomp
--sysroot=/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.2.sdk
-miphoneos-version-min=4.2
-- CMAKE_C_FLAGS:-arch armv6 -arch armv7 -pipe -no-cpp-precomp
--sysroot=/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.2.sdk
-miphoneos-version-min=4.2
-- CMAKE_CXX_FLAGS -arch armv6 -arch armv7 -pipe -no-cpp-precomp
--sysroot=/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.2.sdk
-miphoneos-version-min=4.2
-- CMAKE_C_LINK_FLAGS-arch armv6 -arch armv7 -pipe -no-cpp-precomp
--sysroot=/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.2.sdk
-miphoneos-version-min=4.2
-- CMAKE_CXX_LINK_FLAGS -arch armv6 -arch armv7 -pipe -no-cpp-precomp
--sysroot=/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.2.sdk
-miphoneos-version-min=4.2
-- The C compiler identification is GNU
-- The CXX compiler identification is GNU
-- Check for working C compiler:
/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/gcc-4.2
-- Check for working C compiler:
/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/gcc-4.2 -- broken
CMake Error at
/opt/local/share/cmake-2.8/Modules/CMakeTestCCompiler.cmake:52 (MESSAGE):
The C compiler
/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/gcc-4.2 is not
able to compile a simple test program.
It fails with the following output:
Change Dir:
/Users/jholewinski/projects/rapture/build-test/ios/CMakeFiles/CMakeTmp
Run Build Command:/usr/bin/make cmTryCompileExec/fast
/usr/bin/make -f CMakeFiles/cmTryCompileExec.dir/build.make
CMakeFiles/cmTryCompileExec.dir/build
/opt/local/bin/cmake -E cmake_progress_report
/Users/jholewinski/projects/rapture/build-test/ios/CMakeFiles/CMakeTmp/CMakeFiles
1
Building C object CMakeFiles/cmTryCompileExec.dir/testCCompiler.c.obj
/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/gcc-4.2
-I/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.2.sdk/usr/include
-o CMakeFiles/cmTryCompileExec.dir/testCCompiler.c.obj -c
/Users/jholewinski/projects/rapture/build-test/ios/CMakeFiles/CMakeTmp/testCCompiler.c
Linking C executable cmTryCompileExec
/opt/local/bin/cmake -E cmake_link_script
CMakeFiles/cmTryCompileExec.dir/link.txt --verbose=1
Re: [CMake] Visual Studio project layout
I'm trying to reduce the number of toplevel projects in my CMake generated Visual Studio solution. The idea is to group some targets in solution paths. The layout should look like this: Solution - Target 1 - Foo + Target 2 + Target 3 - Target 4 ... Is there a way to achieve this with CMake? Search for property SOLUTION_FOLDER, introduced in 2.8.3. Eike ___ 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://www.cmake.org/mailman/listinfo/cmake
[CMake] How to inform the linker of segment properties
I am building a Windows DLL that has some of its global variables allocated
in a special shared memory segment.
In order to inform the linker (VS Express 2008) about the segment's
properties, I need to provide the following command-line parameter to the
linker:
/SECTION:.shared,RWS
Could anyone advise me of the recommended way to tell cmake to configure VS
Express 2008 to use this command-line parameter?
Currently, in my cmake file, I have a line like:
set (CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS}
/SECTION:.shared,RWS)
but it appears to have no effect on the linker configuration in VS Express
2008.
Many thanks in advance,
Steven.
___
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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] How to inform the linker of segment properties
I am building a Windows DLL that has some of its global variables
allocated in a special shared memory segment.
In order to inform the linker (VS Express 2008) about the segment's
properties, I need to provide the following command-line parameter to the
linker:
/SECTION:.shared,RWS
Could anyone advise me of the recommended way to tell cmake to configure
VS Express 2008 to use this command-line parameter?
Currently, in my cmake file, I have a line like:
set (CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS}
/SECTION:.shared,RWS)
but it appears to have no effect on the linker configuration in VS
Express 2008.
Try SET_TARGET_PROPERTES(mydll PROPERTIES LINK_FLAGS /SECTION...)
Eike
___
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://www.cmake.org/mailman/listinfo/cmake
[CMake] CTest and PYTHONPATH
Hi,
I'm having some trouble setting PYTHONPATH in order to test a python
extension module built with cmake.
Currently I do the following:
add_test(NAME py_test COMMAND ${PYTHON_EXECUTABLE}
${CMAKE_CURRENT_SOURCE_DIR}/test_runner.py)
if (CMAKE_CONFIGURATION_TYPES)
set (PY_DIR ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR})
else ()
set (PY_DIR ${CMAKE_BINARY_DIR}/bin)
endif ()
set_tests_properties(py_test
PROPERTIES ENVIRONMENT PYTHONPATH=${PY_DIR})
The problem is that ${CMAKE_CFG_INTDIR} doesn't get parsed fully, so
PY_DIR expands to ../vs10x64/bin/$(Configuration), which obviously
doesn't work.
Searching this mailing list, I can see that other people have had
trouble with this, but I'm unsure what to do in my case.
Should I use $CONFIGURATION and pass arguments to add_test or ... ?
kind regards
Anders
___
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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] CTest and PYTHONPATH
On 12/14/2010 05:00 PM, Anders Wang Kristensen wrote:
Hi,
I'm having some trouble setting PYTHONPATH in order to test a python
extension module built with cmake.
Currently I do the following:
add_test(NAME py_test COMMAND ${PYTHON_EXECUTABLE}
${CMAKE_CURRENT_SOURCE_DIR}/test_runner.py)
if (CMAKE_CONFIGURATION_TYPES)
set (PY_DIR ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR})
else ()
set (PY_DIR ${CMAKE_BINARY_DIR}/bin)
endif ()
set_tests_properties(py_test
PROPERTIES ENVIRONMENT PYTHONPATH=${PY_DIR})
The problem is that ${CMAKE_CFG_INTDIR} doesn't get parsed fully, so
PY_DIR expands to ../vs10x64/bin/$(Configuration), which obviously
doesn't work.
Searching this mailing list, I can see that other people have had
trouble with this, but I'm unsure what to do in my case.
Should I use $CONFIGURATION and pass arguments to add_test or ... ?
kind regards
Anders
Yes, pass $CONFIGURATION as an argument to your test_runner.py and in
there do sys.path.insert(0, path/to/your/package) to adjust the search
path. Be prepared for the case where $CONFIGURATION is empty.
Michael
___
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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Cross-compiling, CMAKE_C_FLAGS, and configure-time compiler tests
On Tue, Dec 14, 2010 at 4:45 AM, Johan Björk p...@spotify.com wrote:
Hi Justin,
I'm very unsure if this is the correct solution, but it worked for me. I
haven't been able to find any good documentation stating how the CMakeCache
interacts with other parts of CMake.
My assumption is that since CMAKE_C{XX}_FLAGS is supposed to allow the user
to set optional compilation flags, it prefers the value in the cache versus
the one from the toolchain file.
From one of my toolchain files, reproduce as necessary for CMAKE_C_FLAGS:
SET(CMAKE_CXX_FLAGS ${CMAKE_C_FLAGS} -fno-rtti CACHE STRING FORCE)
I'll have to give that a try. For now, I'm getting around the problem by
setting the flags within the parent CMakeLists.txt script after loading the
toolchain file.
I'm really not sure what the best practice is for this situation. The
compiler will work and can be tested without the -arch flags, but the
flags are necessary to build for the *right* architecture. Most
cross-compilers will only produce binaries for the target system, so the
point is moot. The iOS compilers, however, will generate code for Intel and
ARM so I'm not sure if testing the i386 back-end when I'm targeting ARM is
the right way or not.
Cheers
/Johan
On Mon, Dec 13, 2010 at 4:49 PM, Justin Holewinski
justin.holewin...@gmail.com wrote:
I am experiencing a cross-compiling issue that I believe is related to how
toolchain files interact with the configure-time compiler checks. For
reference, I am targeting the iOS 4.2 SDK. I have a toolchain file that
sets CMAKE_C_FLAGS, CMAKE_CXX_FLAGS, CMAKE_C_LINK_FLAGS, and
CMAKE_CXX_LINK_FLAGS with appropriate flags for the iOS platform, in
particular -arch armv6 -arch armv7. The toolchain file also sets the
proper C and C++ compilers.
When CMake is executed and the C compiler is tested, the
toolchain-specified compiler arguments are passed to the link line, but
*not* the compile line (according to the error output). Since the compile
line does not contain the -arch arguments, the generated object file is
for i386. However, since the link line contains these flags, the linker
tries to link ARM code and fails.
Are there any additional variables I should be setting in addition to
CMAKE_C_FLAGS and CMAKE_CXX_FLAGS in order to get the compiler tests to use
the right flags? If I add the -arch flags using ADD_DEFINITIONS(), they
are passed to the compiler test and it succeeds. That seems like a hack and
not a proper solution, though.
Below is the CMake output that prints the values of CMAKE_*_FLAGS as set
by the toolchain file, as well as the compile and link lines used by CMake.
I am using CMake 2.8.3 on Snow Leopard 10.6.5.
CMake Output:
-- CMAKE_C_FLAGS:-arch armv6 -arch armv7 -pipe -no-cpp-precomp
--sysroot=/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.2.sdk
-miphoneos-version-min=4.2
-- CMAKE_CXX_FLAGS -arch armv6 -arch armv7 -pipe -no-cpp-precomp
--sysroot=/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.2.sdk
-miphoneos-version-min=4.2
-- CMAKE_C_LINK_FLAGS-arch armv6 -arch armv7 -pipe -no-cpp-precomp
--sysroot=/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.2.sdk
-miphoneos-version-min=4.2
-- CMAKE_CXX_LINK_FLAGS -arch armv6 -arch armv7 -pipe -no-cpp-precomp
--sysroot=/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.2.sdk
-miphoneos-version-min=4.2
-- CMAKE_C_FLAGS:-arch armv6 -arch armv7 -pipe -no-cpp-precomp
--sysroot=/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.2.sdk
-miphoneos-version-min=4.2
-- CMAKE_CXX_FLAGS -arch armv6 -arch armv7 -pipe -no-cpp-precomp
--sysroot=/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.2.sdk
-miphoneos-version-min=4.2
-- CMAKE_C_LINK_FLAGS-arch armv6 -arch armv7 -pipe -no-cpp-precomp
--sysroot=/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.2.sdk
-miphoneos-version-min=4.2
-- CMAKE_CXX_LINK_FLAGS -arch armv6 -arch armv7 -pipe -no-cpp-precomp
--sysroot=/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.2.sdk
-miphoneos-version-min=4.2
-- The C compiler identification is GNU
-- The CXX compiler identification is GNU
-- Check for working C compiler:
/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/gcc-4.2
-- Check for working C compiler:
/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/gcc-4.2 -- broken
CMake Error at
/opt/local/share/cmake-2.8/Modules/CMakeTestCCompiler.cmake:52 (MESSAGE):
The C compiler
/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/gcc-4.2 is
not
able to compile a simple test program.
It fails with the following output:
Change Dir:
/Users/jholewinski/projects/rapture/build-test/ios/CMakeFiles/CMakeTmp
Run Build Command:/usr/bin/make cmTryCompileExec/fast
/usr/bin/make -f CMakeFiles/cmTryCompileExec.dir/build.make
CMakeFiles/cmTryCompileExec.dir/build
[CMake] FindOOoSDK.cmake jam
Greetings,
I keep stalling on line 100 of FindOOoSDK.cmake shipped with the current
version of koffice (of kde.org) (A copy is attached) I have all the
prerequisites installed in /opt/openoffice.org. I would be grateful if
someone more aufait with cmake modules could offer some advice on what is
wrong/suggest a fix.
sincerely
luxInteg
# OOOSDK_FOUND
# OOOSDK_INCLUDE_DIRS
# OOOSDK_LIBRARY_DIRS
# OOOSDK_LIBRARIES
#
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
#
# Copyright (C) 2010 KO GmbH jos.van.den.oe...@kogmbh.com
#
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
# look for cppuhelper/bootstrap.hxx
find_path(OOOSDK_URE_DIR
NAMES share/misc/types.rdb
PATHS /opt/openoffice.org/ure
/usr/lib/ure
/usr/lib64/openoffice.org/ure
)
if (NOT OOOSDK_URE_DIR)
set(OOOSDK_ERROR Could not find share/misc/types.rdb for OOoSDK.)
endif (NOT OOOSDK_URE_DIR)
find_path(OOOSDK_DIR
NAMES sdk/bin/cppumaker program/offapi.rdb
PATHS /opt/openoffice.org/basis3.2
/usr/lib/openoffice/basis3.2
/usr/lib/openoffice/basis3.1
/usr/lib/openoffice/basis3.0
/usr/lib64/openoffice.org/basis3.2
/usr/lib64/openoffice.org/basis3.3
)
if (OOOSDK_DIR)
find_path(CPPUHELPER_INCLUDE_DIR
NAMES cppuhelper/bootstrap.hxx
PATHS ${OOOSDK_DIR}/sdk/include
/usr/include/openoffice
)
if (NOT CPPUHELPER_INCLUDE_DIR)
set(OOOSDK_ERROR
Could not find cppuhelper/bootstrap.hxx for OOoSDK.)
endif (NOT CPPUHELPER_INCLUDE_DIR)
find_library(OOOSDK_LIBRARIES1
NAMES uno_cppuhelpergcc3
PATHS ${OOOSDK_URE_DIR}/lib
${OOOSDK_DIR}/sdk/lib
/usr/lib/ure/lib
)
find_library(OOOSDK_LIBRARIES2
NAMES uno_sal
PATHS ${OOOSDK_URE_DIR}/lib
${OOOSDK_DIR}/sdk/lib
/usr/lib/ure/lib
)
find_library(OOOSDK_LIBRARIES3
NAMES uno_salhelpergcc3
PATHS ${OOOSDK_URE_DIR}/lib
${OOOSDK_DIR}/sdk/lib
/usr/lib/ure/lib
)
find_library(OOOSDK_LIBRARIES4
NAMES uno_cppu
PATHS ${OOOSDK_URE_DIR}/lib
${OOOSDK_DIR}/sdk/lib
/usr/lib/ure/lib
)
set(OOOSDK_LIBRARIES ${OOOSDK_LIBRARIES1} ${OOOSDK_LIBRARIES2} ${OOOSDK_LIBRARIES3} ${OOOSDK_LIBRARIES4})
if (NOT OOOSDK_LIBRARIES)
set(OOOSDK_ERROR Could not find uno_cppuhelpergcc3 for OOoSDK.)
endif (NOT OOOSDK_LIBRARIES)
else (OOOSDK_DIR)
set(OOOSDK_ERROR Could not find sdk/bin/cppumaker
or program/offapi.rdb for OOoSDK.)
endif (OOOSDK_DIR)
if(CPPUHELPER_INCLUDE_DIR AND OOOSDK_URE_DIR AND OOOSDK_LIBRARIES)
set(OOOSDK_FOUND true)
# generate c++ headers
set(_OOOINCLUDE ${CMAKE_CURRENT_BINARY_DIR}/ooosdkinclude)
file(MAKE_DIRECTORY ${_OOOINCLUDE})
add_custom_command(
OUTPUT ${_OOOINCLUDE}/com/sun/star/uno/Exception.hpp
COMMAND ${OOOSDK_DIR}/sdk/bin/cppumaker
ARGS -BUCR
${OOOSDK_URE_DIR}/share/misc/types.rdb
${OOOSDK_DIR}/program/offapi.rdb
WORKING_DIRECTORY ${_OOOINCLUDE}
)
add_custom_target(_oooheaders ALL
DEPENDS ${_OOOINCLUDE}/com/sun/star/uno/Exception.hpp)
set(OOOSDK_INCLUDE_DIRS ${CPPUHELPER_INCLUDE_DIR} ${_OOOINCLUDE})
endif(CPPUHELPER_INCLUDE_DIR AND OOOSDK_URE_DIR AND OOOSDK_LIBRARIES)
if(NOT OOoSDK_FOUND)
if(OOoSDK_FIND_REQUIRED)
message(FATAL_ERROR ${OOOSDK_ERROR})
else(OOoSDK_FIND_REQUIRED)
message(STATUS ${OOOSDK_ERROR})
endif(OOoSDK_FIND_REQUIRED)
else(NOT OOoSDK_FOUND)
message(STATUS Found OpenOffice SDK.)
endif(NOT OOoSDK_FOUND)
___
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://www.cmake.org/mailman/listinfo/cmake
[Cmake-commits] CMake branch, next, updated. v2.8.3-850-g07fa3d3
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 07fa3d311e56cd7158cb668318fcb58ca0e4218e (commit)
via 6d3d650df8c67254fb5b7dafd2a02085ca372070 (commit)
from 67a4de115fac38e526aea034b0aded4cdb55269a (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=07fa3d311e56cd7158cb668318fcb58ca0e4218e
commit 07fa3d311e56cd7158cb668318fcb58ca0e4218e
Merge: 67a4de1 6d3d650
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Tue Dec 14 13:29:02 2010 -0500
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Tue Dec 14 13:29:02 2010 -0500
Merge branch 'dev/add-response-file-support' into next
* dev/add-response-file-support:
Revert response file support
Conflicts:
Source/cmakemain.cxx
diff --cc Source/cmakemain.cxx
index d388d22,ddff71d..a51673c
--- a/Source/cmakemain.cxx
+++ b/Source/cmakemain.cxx
@@@ -120,19 -120,6 +120,17 @@@ static const char * cmDocumentationOpti
{--trace, Put cmake in trace mode.,
Print a trace of all calls made and from where with
message(send_error ) calls.},
+ {--warn-uninitialized, Warn about uninitialized values.,
+ Print a warning when an uninitialized variable is used.},
+ {--warn-unused-vars, Warn about unused variables.,
+ Find variables that are declared or set, but not used.},
+ {--no-warn-unused-cli, Don't warn about command line options.,
+ Don't find variables that are declared on the command line, but not
+ used.},
+ {--check-system-vars, Find problems with variable usage in system
+ files., Normally, unused and uninitialized variables are searched for
+ only in CMAKE_SOURCE_DIR and CMAKE_BINARY_DIR. This flag tells CMake to
+ warn about other files as well.},
- {@[file], Specify a response file.,
-Read arguments from a file. Each argument should be on its own line.},
{--help-command cmd [file], Print help for a single command and exit.,
Full documentation specific to the given command is displayed.
If a file is specified, the documentation is written into and the output
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6d3d650df8c67254fb5b7dafd2a02085ca372070
commit 6d3d650df8c67254fb5b7dafd2a02085ca372070
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Tue Dec 14 13:26:32 2010 -0500
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Tue Dec 14 13:26:32 2010 -0500
Revert response file support
This interferes with other tools' response file support and fails on
Windows which uses response files elsewhere. To properly implement this,
argument parsing should be refactored first.
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 28a7f2f..7bc89a4 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -177,62 +177,6 @@ void cmSystemTools::ExpandRegistryValues(std::string
source, KeyWOW64)
}
#endif
-void cmSystemTools::ExpandResponseFiles(int ac, char** av,
-int argc, char** argv)
-{
- std::vectorstd::string args;
-
- args.push_back(av[0]);
- for(int i = 1; i ac; ++i)
-{
-if(av[i][0] == '@')
- {
- const char* fname = av[i]+1;
- std::ifstream fin(fname);
- if(fin)
-{
-std::string line;
-while(cmSystemTools::GetLineFromStream(fin, line))
- {
- if(!line.empty())
-{
-args.push_back(line);
-}
- }
-}
- else
-{
-cmOStringStream e;
-e Could not open response file \ fname \:
- Superclass::GetLastSystemError();
-cmSystemTools::Error(e.str().c_str());
-}
- }
-else
- {
- args.push_back(av[i]);
- }
-}
-
- argc = args.size();
- argv = new char*[argc + 1];
-
- for(int i = 0; i argc; ++i)
-{
-argv[i] = strdup(args[i].c_str());
-}
- argv[argc] = NULL;
-}
-
-void cmSystemTools::FreeArgv(int argc, char** argv)
-{
- for(int i = 0; i argc; ++i)
-{
-free(argv[i]);
-}
- delete [] argv;
-}
-
std::string cmSystemTools::EscapeQuotes(const char* str)
{
std::string result = ;
diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h
index 954eaeb..6f9147c 100644
--- a/Source/cmSystemTools.h
+++ b/Source/cmSystemTools.h
@@ -46,13 +46,6 @@ public:
static void ExpandRegistryValues(std::string source,
KeyWOW64 view = KeyWOW64_Default);
- ///! Expand response files in an argument list.
- static void ExpandResponseFiles(int ac, char** av,
- int
[Cmake-commits] CMake branch, master, updated. v2.8.3-180-g7584466
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 75844666ac03a95c6546cafb54bce8827e1b664a (commit) via 8e82773eb4e2bb8d135479410393532021d3b85b (commit) via 0621362668af7b5ec73689c75f6c9318425500f9 (commit) from d4b4db68e1af3bf41265a39fedab61ef80fbbad0 (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=75844666ac03a95c6546cafb54bce8827e1b664a commit 75844666ac03a95c6546cafb54bce8827e1b664a Merge: d4b4db6 8e82773 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Dec 14 14:37:52 2010 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Dec 14 14:37:52 2010 -0500 Merge topic 'fix-INSTALL-and-PACKAGE-depend-tracing' 8e82773 Remove unused GLOBAL_TARGET generation code 0621362 Fix dependency tracing of INSTALL and PACKAGE (#11598) --- Summary of changes: Source/cmGlobalGenerator.cxx | 22 ++ Source/cmGlobalGenerator.h |3 +-- Source/cmMakefile.cxx|6 ++ 3 files changed, 9 insertions(+), 22 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.3-184-gb0dffc7
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 b0dffc7e9ca010e42e5baac9623493423664abe8 (commit) via 608d6bba89a5588c370dda6d6d46365c24168b55 (commit) from adf62a98f3460899337b00eb9553b86baf691806 (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=b0dffc7e9ca010e42e5baac9623493423664abe8 commit b0dffc7e9ca010e42e5baac9623493423664abe8 Merge: adf62a9 608d6bb Author: Brad King brad.k...@kitware.com AuthorDate: Tue Dec 14 14:38:09 2010 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Dec 14 14:38:09 2010 -0500 Merge topic 'parallel-make-install-of-CMake' 608d6bb Fix parallel make install of CMake itself --- Summary of changes: Source/cmTarget.cxx |9 + 1 files changed, 9 insertions(+), 0 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.3-186-g24b251a
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 24b251ac555a7cb1d3fa8fb4cfc8d0bbb38aac3d (commit) via 7145ca67fcc252e63b10f5a301683701f1b6a69c (commit) from b0dffc7e9ca010e42e5baac9623493423664abe8 (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=24b251ac555a7cb1d3fa8fb4cfc8d0bbb38aac3d commit 24b251ac555a7cb1d3fa8fb4cfc8d0bbb38aac3d Merge: b0dffc7 7145ca6 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Dec 14 14:38:13 2010 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Dec 14 14:38:13 2010 -0500 Merge topic 'doc-ctest_sleep' 7145ca6 CTest: Fix ctest_sleep documentation (#11554) --- Summary of changes: Source/CTest/cmCTestSleepCommand.h |9 - 1 files changed, 4 insertions(+), 5 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.3-188-gf1adcef
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 f1adcefdf419cee3c358c279984bca1dc69cddc6 (commit) via 3b7f9014942dc79a24c90904312af768a180ae9d (commit) from 24b251ac555a7cb1d3fa8fb4cfc8d0bbb38aac3d (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=f1adcefdf419cee3c358c279984bca1dc69cddc6 commit f1adcefdf419cee3c358c279984bca1dc69cddc6 Merge: 24b251a 3b7f901 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Dec 14 14:38:18 2010 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Dec 14 14:38:18 2010 -0500 Merge topic 'cross-compile-apple-host' 3b7f901 Fix soname in cross-compiled targets with Mac host (#11547) --- Summary of changes: Source/cmTarget.cxx | 39 --- 1 files changed, 24 insertions(+), 15 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.3-190-gb3f2d19
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 b3f2d19ba763401f7c940d9c9f289d5d74422fe1 (commit) via d95913e232af7ada3ee6f60487ebbdee91741e01 (commit) from f1adcefdf419cee3c358c279984bca1dc69cddc6 (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=b3f2d19ba763401f7c940d9c9f289d5d74422fe1 commit b3f2d19ba763401f7c940d9c9f289d5d74422fe1 Merge: f1adcef d95913e Author: Brad King brad.k...@kitware.com AuthorDate: Tue Dec 14 14:38:23 2010 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Dec 14 14:38:23 2010 -0500 Merge topic 'FindTCL-version-ref' d95913e FindTCL: Fix TCL and TK version variable references (#11528) --- Summary of changes: Modules/FindTCL.cmake |4 ++-- 1 files 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, master, updated. v2.8.3-192-g5bea091
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 5bea0917ef53ccb3eb5cca40b3900668161cf5e7 (commit) via cddcad51020d42bbc321f45507a4649b1842aba4 (commit) from b3f2d19ba763401f7c940d9c9f289d5d74422fe1 (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=5bea0917ef53ccb3eb5cca40b3900668161cf5e7 commit 5bea0917ef53ccb3eb5cca40b3900668161cf5e7 Merge: b3f2d19 cddcad5 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Dec 14 14:38:27 2010 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Dec 14 14:38:27 2010 -0500 Merge topic 'fix_incremental_vs2010' cddcad5 Fix incremental linking for VS2010 with nmake or make. --- Summary of changes: Modules/Platform/Windows-cl.cmake |2 ++ Source/cmake.cxx |4 2 files changed, 6 insertions(+), 0 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.3-199-g8e7f048
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 8e7f0488b47458775a162ed031b8635e043978ad (commit) via a80d6e9828b3089519fedbd4eee4c199ce3b8597 (commit) via 88babefbcc84770256027ebfe3f5298ff514e1ca (commit) from 5161f85ef2e8ba83d487fe384565146a747c1777 (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=8e7f0488b47458775a162ed031b8635e043978ad commit 8e7f0488b47458775a162ed031b8635e043978ad Merge: 5161f85 a80d6e9 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Dec 14 14:38:42 2010 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Dec 14 14:38:42 2010 -0500 Merge topic '11445-workaround' a80d6e9 Add Boost 1.46 88babef [patch] Add Boost 1.45 to search, simplify a check removing VERSION_LESS --- Summary of changes: Modules/FindBoost.cmake | 54 ++ 1 files changed, 26 insertions(+), 28 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.3-207-g03c4623
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 03c4623fb4605a347acc20a1914582e794dd474d (commit) via 27ee50a7d81b4d5b975b5015897f88bbd6318118 (commit) via 50d21d4251b179707b4569e5cfff0c9e65432273 (commit) from 5eed07e2d812376067191d7ae444125d491a63df (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=03c4623fb4605a347acc20a1914582e794dd474d commit 03c4623fb4605a347acc20a1914582e794dd474d Merge: 5eed07e 27ee50a Author: Brad King brad.k...@kitware.com AuthorDate: Tue Dec 14 14:38:55 2010 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Dec 14 14:38:55 2010 -0500 Merge topic 'ParallelEclipseMakefiles2' 27ee50a Add ECLIPSE_CDT4_GENERATE_SOURCE_PROJECT as a ADVANCED cache variable (#9631) 50d21d4 Add cache var CMAKE_ECLIPSE_MAKE_ARGUMENTS when using the Eclipse generator --- Summary of changes: Modules/CMakeFindEclipseCDT4.cmake |6 ++ Source/cmExtraEclipseCDT4Generator.cxx | 19 +++ Source/cmExtraEclipseCDT4Generator.h |1 + 3 files changed, 18 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, master, updated. v2.8.3-209-g2c7d36c
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 2c7d36ce6fd0cef9cbd45bb94795dc42526424f2 (commit) via 8d366cd1ebc2a5937a40c4b44074852e3f7e7fae (commit) from 03c4623fb4605a347acc20a1914582e794dd474d (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=2c7d36ce6fd0cef9cbd45bb94795dc42526424f2 commit 2c7d36ce6fd0cef9cbd45bb94795dc42526424f2 Merge: 03c4623 8d366cd Author: Brad King brad.k...@kitware.com AuthorDate: Tue Dec 14 14:39:00 2010 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Dec 14 14:39:00 2010 -0500 Merge topic 'CPackRPM-Fix0011595' 8d366cd CPackRPM fix bug 0011595 : Can't generate RPMs (on FC11...) --- Summary of changes: Modules/CPackRPM.cmake |5 ++--- 1 files changed, 2 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, master, updated. v2.8.3-213-g9e7e106
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 9e7e106dcbf9112f80b6a4eed35b5927df61416d (commit) via 3bc828df9a0869f292de09ddcec306c16fe6d743 (commit) via b316087c095e23e131bf2ccf5eb7110b35df0e29 (commit) via 68cd3fe038471b5a60d396eac141a69414b3064d (commit) from 2c7d36ce6fd0cef9cbd45bb94795dc42526424f2 (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=9e7e106dcbf9112f80b6a4eed35b5927df61416d commit 9e7e106dcbf9112f80b6a4eed35b5927df61416d Merge: 2c7d36c 3bc828d Author: Brad King brad.k...@kitware.com AuthorDate: Tue Dec 14 14:39:06 2010 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Dec 14 14:39:06 2010 -0500 Merge topic 'external-project-args-file' 3bc828d Fixed bug where last entry would be lost. b316087 Escape file write expansion, and build up lists. 68cd3fe Added CMAKE_CACHE_ARGS to ExternalProject. --- Summary of changes: Modules/ExternalProject.cmake | 53 - 1 files changed, 52 insertions(+), 1 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.3-215-g2d1aa4a
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 2d1aa4ad06eedf6bc677c8ebf757f4978a839e02 (commit) via 36cb701690b201136ca4892eb561da3df34ae191 (commit) from 9e7e106dcbf9112f80b6a4eed35b5927df61416d (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=2d1aa4ad06eedf6bc677c8ebf757f4978a839e02 commit 2d1aa4ad06eedf6bc677c8ebf757f4978a839e02 Merge: 9e7e106 36cb701 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Dec 14 14:39:10 2010 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Dec 14 14:39:10 2010 -0500 Merge topic 'dev/support-substring-negative-indices' 36cb701 allow STRING(SUBSTRING) work with length -1 as rest of the string --- Summary of changes: Source/cmStringCommand.cxx |2 +- Tests/StringFileTest/CMakeLists.txt | 24 2 files changed, 25 insertions(+), 1 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.3-874-g631504c
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 631504cbc0a6f85090711c4d3aca8582ca2de262 (commit) via 2d1aa4ad06eedf6bc677c8ebf757f4978a839e02 (commit) via 9e7e106dcbf9112f80b6a4eed35b5927df61416d (commit) via 2c7d36ce6fd0cef9cbd45bb94795dc42526424f2 (commit) via 03c4623fb4605a347acc20a1914582e794dd474d (commit) via 5eed07e2d812376067191d7ae444125d491a63df (commit) via f7036a1603fadcb500a5522cc397cd3b884e6e21 (commit) via 8e7f0488b47458775a162ed031b8635e043978ad (commit) via 5161f85ef2e8ba83d487fe384565146a747c1777 (commit) via 5bea0917ef53ccb3eb5cca40b3900668161cf5e7 (commit) via b3f2d19ba763401f7c940d9c9f289d5d74422fe1 (commit) via f1adcefdf419cee3c358c279984bca1dc69cddc6 (commit) via 24b251ac555a7cb1d3fa8fb4cfc8d0bbb38aac3d (commit) via b0dffc7e9ca010e42e5baac9623493423664abe8 (commit) via adf62a98f3460899337b00eb9553b86baf691806 (commit) via 75844666ac03a95c6546cafb54bce8827e1b664a (commit) via d4b4db68e1af3bf41265a39fedab61ef80fbbad0 (commit) via dba6b2be54e709d2b1062bb71df314e8eb592cc4 (commit) via b7c29a4d7330857c672f0285e2a4e18fa90374b2 (commit) from 47e42872654a72197cd9c82415e191b1ccc78e79 (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=631504cbc0a6f85090711c4d3aca8582ca2de262 commit 631504cbc0a6f85090711c4d3aca8582ca2de262 Merge: 47e4287 2d1aa4a Author: Brad King brad.k...@kitware.com AuthorDate: Tue Dec 14 14:39:39 2010 -0500 Commit: Brad King brad.k...@kitware.com CommitDate: Tue Dec 14 14:39:39 2010 -0500 Merge branch 'master' into next --- 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.3-882-gd555dd3
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 d555dd3854f7b59f1c335a05f1920908ee3f1fcd (commit)
via 86979e49a16b0fc2976329480d236e62471f331a (commit)
from 35cd1383e56e1aef0a1c35f75aab328ff3150094 (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=d555dd3854f7b59f1c335a05f1920908ee3f1fcd
commit d555dd3854f7b59f1c335a05f1920908ee3f1fcd
Merge: 35cd138 86979e4
Author: Bill Hoffman bill.hoff...@kitware.com
AuthorDate: Tue Dec 14 15:06:36 2010 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Dec 14 15:06:36 2010 -0500
Merge topic 'CPack-AddMoreTests' into next
86979e4 Change cpack run and verify script to work with multi-config
generators.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=86979e49a16b0fc2976329480d236e62471f331a
commit 86979e49a16b0fc2976329480d236e62471f331a
Author: Bill Hoffman bill.hoff...@kitware.com
AuthorDate: Tue Dec 14 13:42:21 2010 -0500
Commit: Bill Hoffman bill.hoff...@kitware.com
CommitDate: Tue Dec 14 13:42:21 2010 -0500
Change cpack run and verify script to work with multi-config generators.
Use the location of the running cmake to find cpack, and use the
CMAKE_CONFIG_TYPE environtment variable as a type for cpack.
diff --git a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
index b0cacb8..11f72ec 100644
--- a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
+++ b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
@@ -9,7 +9,9 @@ endif(NOT CPackComponentsForAll_BINARY_DIR)
if(NOT CPackGen)
message(FATAL_ERROR CPackGen not set)
endif(NOT CPackGen)
-
+get_filename_component(CPACK_LOCATION ${CMAKE_COMMAND} PATH)
+set(CPackCommand ${CPACK_LOCATION}/cpack)
+message(cpack = ${CPackCommand})
if(NOT CPackCommand)
message(FATAL_ERROR CPackCommand not set)
endif(NOT CPackCommand)
@@ -24,8 +26,13 @@ set(expected_file_mask )
# May produce several numbers of files depending on
# CPACK_COMPONENT_xxx values
set(expected_count 1)
-
-execute_process(COMMAND ${CPackCommand} -G ${CPackGen} -C Release
+set(config_type $ENV{CMAKE_CONFIG_TYPE})
+set(config_args )
+if(config_type)
+ set(config_args -C ${config_type})
+endif()
+message( ${config_args})
+execute_process(COMMAND ${CPackCommand} -G ${CPackGen} ${config_args}
RESULT_VARIABLE CPack_result
OUTPUT_VARIABLE CPack_output
ERROR_VARIABLE CPack_error
---
Summary of changes:
.../RunCPackVerifyResult.cmake | 13 ++---
1 files changed, 10 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.3-884-ga9808ee
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 a9808eeba7a31ebe404f92c7a4add539155036cd (commit)
via 2afb820352845513d46af1464cb1161e335eb435 (commit)
from d555dd3854f7b59f1c335a05f1920908ee3f1fcd (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=a9808eeba7a31ebe404f92c7a4add539155036cd
commit a9808eeba7a31ebe404f92c7a4add539155036cd
Merge: d555dd3 2afb820
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Dec 14 16:38:26 2010 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Dec 14 16:38:26 2010 -0500
Merge topic 'try-compile-min-version' into next
2afb820 Write full version into try_compile CMakeLists
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2afb820352845513d46af1464cb1161e335eb435
commit 2afb820352845513d46af1464cb1161e335eb435
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Dec 14 09:36:06 2010 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Dec 14 16:36:55 2010 -0500
Write full version into try_compile CMakeLists
Pass the full version to cmake_minimum_required(VERSION) in generated
CMake files for try_compile projects. This tells CMake not to use any
backward compatibility behavior while processing code it generates.
diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index b8a0c95..a1c707d 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -169,8 +169,9 @@ int
cmCoreTryCompile::TryCompileCode(std::vectorstd::string const argv)
const char* lang =(this-Makefile-GetCMakeInstance()-GetGlobalGenerator()
-GetLanguageFromExtension(ext.c_str()));
const char* def = this-Makefile-GetDefinition(CMAKE_MODULE_PATH);
-fprintf(fout, cmake_minimum_required(VERSION %u.%u)\n,
-cmVersion::GetMajorVersion(), cmVersion::GetMinorVersion());
+fprintf(fout, cmake_minimum_required(VERSION %u.%u.%u.%u)\n,
+cmVersion::GetMajorVersion(), cmVersion::GetMinorVersion(),
+cmVersion::GetPatchVersion(), cmVersion::GetTweakVersion());
if(def)
{
fprintf(fout, SET(CMAKE_MODULE_PATH %s)\n, def);
---
Summary of changes:
Source/cmCoreTryCompile.cxx |5 +++--
1 files changed, 3 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.3-891-gfc40262
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 fc4026227e2abaef0de9a7843bf8f528b503cabb (commit)
via a924ee511a33963fdce693b77982131df481df8f (commit)
via 3e8559879e983bd5857f521a4b3274eea6387ccd (commit)
via 364530c94ec1f81f21fda6771a23670fe7e0a6bb (commit)
via eb74f519e90d880ed895ea2243aae2d64c2ba8f4 (commit)
via 15712e2be89983e6be8a3d4b3a20966163266c00 (commit)
via 07410f329d8a219fc8c6153212cdcdb6034ab27c (commit)
from a9808eeba7a31ebe404f92c7a4add539155036cd (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=fc4026227e2abaef0de9a7843bf8f528b503cabb
commit fc4026227e2abaef0de9a7843bf8f528b503cabb
Merge: a9808ee a924ee5
Author: Alexander Neundorf neund...@kde.org
AuthorDate: Tue Dec 14 16:44:17 2010 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Dec 14 16:44:17 2010 -0500
Merge topic
'PreferCMakeModulesByCMakeModulesWithPolicy-NoTrailingWhitespaceCommit' into
next
a924ee5 Add comment about CMP0017 to docs of include()
3e85598 Remove trailing whitespace
364530c Remove trailing whitespace
eb74f51 Add support for CMAKE_POLICY_DEFAULT_CMP variables.
15712e2 Fix indentation in cmPolicies::ApplyPolicyVersion()
07410f3 Prefer files from CMAKE_ROOT when including from CMAKE_ROOT.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a924ee511a33963fdce693b77982131df481df8f
commit a924ee511a33963fdce693b77982131df481df8f
Author: Alex Neundorf neund...@kde.org
AuthorDate: Tue Dec 14 22:38:33 2010 +0100
Commit: Alex Neundorf neund...@kde.org
CommitDate: Tue Dec 14 22:38:33 2010 +0100
Add comment about CMP0017 to docs of include()
Alex
diff --git a/Source/cmIncludeCommand.h b/Source/cmIncludeCommand.h
index 8704750..a6d43ba 100644
--- a/Source/cmIncludeCommand.h
+++ b/Source/cmIncludeCommand.h
@@ -73,7 +73,12 @@ public:
the variable will be set to the full filename which
has been included or NOTFOUND if it failed.\n
If a module is specified instead of a file, the file with name
- modulename.cmake is searched in the CMAKE_MODULE_PATH.
+ modulename.cmake is searched first in CMAKE_MODULE_PATH, then in the
+ CMake module directory. There is one exception to this: if the file
+ which calls include() is located itself in the CMake module directory,
+ then first the CMake module directory is searched and
+ CMAKE_MODULE_PATH afterwards. This behaviour is controlled by policy
+ CMP0017.
\n
See the cmake_policy() command documentation for discussion of the
NO_POLICY_SCOPE option.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3e8559879e983bd5857f521a4b3274eea6387ccd
commit 3e8559879e983bd5857f521a4b3274eea6387ccd
Author: Alex Neundorf neund...@kde.org
AuthorDate: Tue Dec 14 22:25:53 2010 +0100
Commit: Alex Neundorf neund...@kde.org
CommitDate: Tue Dec 14 22:25:53 2010 +0100
Remove trailing whitespace
Alex
diff --git a/Source/cmIncludeCommand.h b/Source/cmIncludeCommand.h
index a215275..8704750 100644
--- a/Source/cmIncludeCommand.h
+++ b/Source/cmIncludeCommand.h
@@ -15,7 +15,7 @@
#include cmCommand.h
/** \class cmIncludeCommand
- * \brief
+ * \brief
*
* cmIncludeCommand defines a list of distant
* files that can be included in the current list file.
@@ -28,7 +28,7 @@ public:
/**
* This is a virtual constructor for the command.
*/
- virtual cmCommand* Clone()
+ virtual cmCommand* Clone()
{
return new cmIncludeCommand;
}
@@ -49,15 +49,15 @@ public:
* The name of the command as specified in CMakeList.txt.
*/
virtual const char* GetName() {return include;}
-
+
/**
* Succinct documentation.
*/
- virtual const char* GetTerseDocumentation()
+ virtual const char* GetTerseDocumentation()
{
return Read CMake listfile code from the given file.;
}
-
+
/**
* More documentation.
*/
@@ -79,7 +79,7 @@ public:
NO_POLICY_SCOPE option.
;
}
-
+
cmTypeMacro(cmIncludeCommand, cmCommand);
};
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=364530c94ec1f81f21fda6771a23670fe7e0a6bb
commit 364530c94ec1f81f21fda6771a23670fe7e0a6bb
Author: Alex Neundorf neund...@kde.org
AuthorDate: Tue Dec 14 22:25:21 2010 +0100
Commit: Alex Neundorf neund...@kde.org
CommitDate: Tue Dec 14 22:25:21 2010 +0100
Remove trailing whitespace
Alex
diff --git a/Source/cmIncludeCommand.cxx b/Source/cmIncludeCommand.cxx
index c9b14a1..0ac6df4 100644
---
[Cmake-commits] CMake branch, next, updated. v2.8.3-893-g9a2f329
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 9a2f329c4c07a3f3c2bb4c8a1addea36f83c0f67 (commit) via 3a14b6e5561feb33225d61fd2897d79c2779809b (commit) from fc4026227e2abaef0de9a7843bf8f528b503cabb (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=9a2f329c4c07a3f3c2bb4c8a1addea36f83c0f67 commit 9a2f329c4c07a3f3c2bb4c8a1addea36f83c0f67 Merge: fc40262 3a14b6e Author: Brad King brad.k...@kitware.com AuthorDate: Tue Dec 14 18:13:28 2010 -0500 Commit: Brad King brad.k...@kitware.com CommitDate: Tue Dec 14 18:13:28 2010 -0500 Merge branch 'master' into next --- Summary of changes: Source/kwsys/SystemTools.cxx |2 +- Source/kwsys/testSystemTools.cxx |2 +- 2 files 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
