summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'fix-IMPORTED-GLOBAL-reconfigure'Brad King2012-11-201-0/+1
|\ | | | | | | | | 5ff7587 Initialize IMPORTED GLOBAL targets on reconfigure (#13702)
| * Initialize IMPORTED GLOBAL targets on reconfigure (#13702)Brad King2012-11-191-0/+1
| | | | | | | | | | | | | | | | | | Since commit ca39c5cd (Optionally allow IMPORTED targets to be globally visible, 2012-01-25) cmGlobalGenerator has a second member that tracks targets with global scope. We must initialize the new 'ImportedTargets' member wherever the old 'TotalTargets' member is initialized. Without this initialization the ImportedTargets member is left with dangling pointers during a same-process re-configuration.
* | Merge topic 'AutomocInheritFOLDERTargetProperty'Brad King2012-11-201-1/+17
|\ \ | | | | | | | | | | | | 3efe1d3 Automoc: "inherit" FOLDER target property from target (#13688)
| * | Automoc: "inherit" FOLDER target property from target (#13688)Alex Neundorf2012-11-171-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch sets the FOLDER target property for the automoc target to the same value as of the actual target. This organizes the targets in IDEs with folders better. Inspired-by: Mike Gelfand Alex
* | | Merge topic 'vs-drop-Zm'Brad King2012-11-201-1/+6
|\ \ \ | | | | | | | | | | | | | | | | cd73979 MSVC: Drop default use of /Zm1000 for VS >= 7.1
| * | | MSVC: Drop default use of /Zm1000 for VS >= 7.1Brad King2012-11-161-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From the option documentation of VS >= 7.1: "In earlier versions of Visual C++, the compiler used several discrete heaps, and each had a finite limit. Currently, the compiler dynamically grows the heaps as necessary up to a total heap size limit, and requires a fixed-size buffer only to construct precompiled headers. Consequently, the /Zm compiler option is rarely necessary." http://msdn.microsoft.com/en-us/library/bdscwf1c.aspx Suggested-by: Adam Moss <adam@broadcom.com>
* | | | Merge topic 'vs-global-sections'Brad King2012-11-2023-17/+232
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 45d4f81 Merge topic 'per-config-EXCLUDE_FROM_DEFAULT_BUILD' into vs-global-sections 694322e Define properties VS_GLOBAL_SECTION_* 2c91962 Implement properties VS_GLOBAL_SECTION_* 57cadc1 Add tests for VS_SOLUTION_GLOBAL_SECTIONS
| * \ \ \ Merge topic 'per-config-EXCLUDE_FROM_DEFAULT_BUILD' into vs-global-sectionsBrad King2012-11-1613-42/+172
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Source/cmGlobalVisualStudio7Generator.h
| * | | | | Define properties VS_GLOBAL_SECTION_*Petr Kmoch2012-11-161-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add definition and documentation of properties VS_GLOBAL_SECTION_PRE_<section> and VS_GLOBAL_SECTION_POST_<section>.
| * | | | | Implement properties VS_GLOBAL_SECTION_*Petr Kmoch2012-11-164-17/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add properties VS_GLOBAL_SECTION_PRE_<name> and VS_GLOBAL_SECTION_POST_<name>, which can be used to generate custom GlobalSection-s in the .sln file.
| * | | | | Add tests for VS_SOLUTION_GLOBAL_SECTIONSPetr Kmoch2012-11-1618-0/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add tests for correct appliation of directory properties VS_SOLUTION_GLOBAL_SECTIONS_*
* | | | | | Merge topic 'per-config-EXCLUDE_FROM_DEFAULT_BUILD'Brad King2012-11-2013-42/+172
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 739f166 Serialize tests for EXCLUDE_FROM_DEFAULT_BUILD e31d83b Define property EXCLUDE_FROM_DEFAULT_BUILD d1f8828 Add property EXCLUDE_FROM_DEFAULT_BUILD_<CONFIG> b777272 Add tests for EXCLUDE_FROM_DEFAULT_BUILD
| * | | | | Serialize tests for EXCLUDE_FROM_DEFAULT_BUILDBrad King2012-11-131-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tests share a single build directory and so should not run in parallel. While at it, add the build dir to the test_clean target.
| * | | | | Define property EXCLUDE_FROM_DEFAULT_BUILDPetr Kmoch2012-11-131-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add definition and documentation of properties EXLCUDE_FROM_DEFAULT_BUILD and EXCLUDE_FROM_DEFAULT_BUILD_<CONFIG>.
| * | | | | Add property EXCLUDE_FROM_DEFAULT_BUILD_<CONFIG>Petr Kmoch2012-11-137-42/+65
| | | | | | | | | | | | | | | | | | | | | | | | Allow EXCLUDE_FROM_DEFAULT_BUILD to be specified per configuration.
| * | | | | Add tests for EXCLUDE_FROM_DEFAULT_BUILDPetr Kmoch2012-11-135-0/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add tests for EXCLUDE_FROM_DEFAULT_BUILD and its per-configuration variants.
* | | | | | CMake Nightly Date StampKitware Robot2012-11-201-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2012-11-191-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2012-11-181-1/+1
| |_|_|/ / |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2012-11-171-1/+1
| |_|/ / |/| | |
* | | | CMake Nightly Date StampKitware Robot2012-11-161-1/+1
| |/ / |/| |
* | | CMake Nightly Date StampKitware Robot2012-11-151-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2012-11-141-1/+1
| | |
* | | Merge topic 'CPack-BugFixesSet'Brad King2012-11-131-1/+0
|\ \ \ | | | | | | | | | | | | | | | | b6f7881 Remove seemingly bogus duplicate CPACK_PACKAGE_FILE_NAME call.
| * | | Remove seemingly bogus duplicate CPACK_PACKAGE_FILE_NAME call.Andreas Mohr2012-11-111-1/+0
| | | | | | | | | | | | | | | | Signed-off-by: Eric NOULARD <eric.noulard@gmail.com>
* | | | Merge topic 'CPack-fixTypoInErrorMsg'Brad King2012-11-131-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 572d9e1 Correct string literal typo (have "(NULL)" like all other cases).
| * | | | Correct string literal typo (have "(NULL)" like all other cases).Andreas Mohr2012-11-101-1/+1
| |/ / / | | | | | | | | | | | | Signed-off-by: Eric NOULARD <eric.noulard@gmail.com>
* | | | Merge topic 'only-git-fetch-when-necessary'Brad King2012-11-136-5/+307
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a41d3a4 ExternalProjectUpdateTest: Only support Git 1.6.5 and greater. de760c1 ExternalProject: Verify when a fetch occurs during update test. 0a34433 ExternalProject: Make sure the ExternalProjectUpdate setup is available. 9b66c8f ExternalProject: Always do a git fetch for a remote ref. 2619f4d ExternalProject: Add tests for UPDATE_COMMAND. 378aa12 ExternalProject: Do smoke tests for Git Tutorial builds. d075829 ExternalProject: Only run 'git fetch' when required.
| * | | | ExternalProjectUpdateTest: Only support Git 1.6.5 and greater.Matt McCormick2012-11-131-0/+18
| | | | |
| * | | | ExternalProject: Verify when a fetch occurs during update test.Matt McCormick2012-11-131-10/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The performance feature of only performing a git fetch when needed during the ExternalProject update step is verified during the test. A fetch is identified by removing the FETCH_HEAD file and checking for its reincarnation.
| * | | | ExternalProject: Make sure the ExternalProjectUpdate setup is available.Matt McCormick2012-11-132-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | | This prepares the numberous tests that occur in the ExternalProjectUpdate test. The tests were passing previously because a fresh build was not performed.
| * | | | ExternalProject: Always do a git fetch for a remote ref.Matt McCormick2012-11-132-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | Remote git refs always require a git fetch, because the remote may move around where the ref points.
| * | | | ExternalProject: Add tests for UPDATE_COMMAND.Matt McCormick2012-11-134-0/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tests are added for UPDATE_COMMAND to ensure it is working properly. Testing infrastructure is added along with tests for Git, but tests for other version control systems could easily be added in the future.
| * | | | ExternalProject: Do smoke tests for Git Tutorial builds.Matt McCormick2012-11-031-0/+11
| | | | |
| * | | | ExternalProject: Only run 'git fetch' when required.Matt McCormick2012-11-031-5/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the current default update step for Git under the ExternalProject_Add command, a 'git fetch' is always performed, followed by a 'git checkout' and 'git submodule update --recursive'. However, a 'git fetch' can be time consuming and requires a network connection. To save time, we look at the current checked out hash, and only perform the fetch if required. This is performed in a CMake script so we can handle the conditional logic in a cross platform manner.
* | | | | Merge topic 'link-depends-no-shared'Brad King2012-11-139-1/+109
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 306796e Teach BuildDepends test to cover LINK_DEPENDS_NO_SHARED ed97631 Optionally skip link dependencies on shared library files
| * | | | | Teach BuildDepends test to cover LINK_DEPENDS_NO_SHAREDBrad King2012-11-095-0/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build a shared library and an executable linking to it inside the inner test. Set LINK_DEPENDS_NO_SHARED on the executable. Add a custom target to compare the output file times. Verify that on the first build the executable is newer than the library. Then modify a library source file. Verify that on the second build the library is newer because the executable did not have a dependency to re-link.
| * | | | | Optionally skip link dependencies on shared library filesBrad King2012-10-264-1/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add target property LINK_DEPENDS_NO_SHARED and initialization variable CMAKE_LINK_DEPENDS_NO_SHARED to enable this behavior. Suggested-by: Leif Walsh <leif.walsh@gmail.com>
* | | | | | Merge topic 'update-KWSys'Brad King2012-11-131-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1acc689 Merge branch 'upstream-kwsys' into update-KWSys 4cf44d3 KWSys 2012-11-08 (3b17de34)
| * \ \ \ \ \ Merge branch 'upstream-kwsys' into update-KWSysBrad King2012-11-091-1/+1
| |\ \ \ \ \ \
| | * | | | | | KWSys 2012-11-08 (3b17de34)KWSys Robot2012-11-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ 3b17de34 | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' df32fa6f..3b17de34 Brad King (1): 3b17de34 SystemInformation: Do not dereference NULL ifa_addr Change-Id: I2aecf9978d1f66ed021f47620d176a3837bc2ea3
* | | | | | | | Merge topic 'fix-compiler-warnings'Brad King2012-11-1311-77/+28
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 737534c Remove references to ancient and removed parts of the code. 21e8a08 Resolve ambiguity warning regarding use of && and ||. 5f6432f Resolve warnings about shadowing parameters and local variables. 9f16d42 Resolve warnings about used enum values in switch blocks. bd8bdb6 Resolve warnings about unused variables.
| * | | | | | | | Remove references to ancient and removed parts of the code.Stephen Kelly2012-11-131-56/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This file came from ITK, and probably came from python before that. This commit fixes a warning about the unused _PyPopenProcs variable.
| * | | | | | | | Resolve ambiguity warning regarding use of && and ||.Stephen Kelly2012-11-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is not ambiguous to the compiler, but it may seem ambiguous to the reader. From reading 3a53005f (Build object library targets in VS), 5484550a (Detect and set Unicode character set in VS 10), and 9e01aefd (VS: Add support for WinRT project properties (#12930)), this appears to be the intentional semantic.
| * | | | | | | | Resolve warnings about shadowing parameters and local variables.Stephen Kelly2012-11-136-16/+18
| | | | | | | | |
| * | | | | | | | Resolve warnings about used enum values in switch blocks.Stephen Kelly2012-11-133-0/+7
| | | | | | | | |
| * | | | | | | | Resolve warnings about unused variables.Stephen Kelly2012-11-074-3/+1
| | | | | | | | |
* | | | | | | | | Merge topic 'osx-bad-sdk-xcode-3.2.6'Brad King2012-11-131-0/+17
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 720d790 OS X: Warn about known SDK breakage by Xcode 3.2.6
| * | | | | | | | | OS X: Warn about known SDK breakage by Xcode 3.2.6Brad King2012-11-081-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Xcode 3.2.6 is known to break the SDK Library/Frameworks layout. Detect and warn about this case to tell users to fix their system. Reported-by: Matthew Brett <matthew.brett@gmail.com>
* | | | | | | | | | Merge topic 'doc-fixups'Brad King2012-11-1312-24/+39
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fa04673 Documentation: Clarify configure_file behavior 07d5e4b Documentation: Clarify some command descriptions 965de97 Documentation: Correct typos and grammar