summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into automoc_qt5Stephen Kelly2011-11-1017-67/+183
|\
| * KWSys Nightly Date StampKWSys Robot2011-11-091-1/+1
| |
| * Merge topic 'fix-typo'David Cole2011-11-081-1/+1
| |\ | | | | | | | | | | | | 6d51f5f Fix typo.
| | * Fix typo.Stephen Kelly2011-11-041-1/+1
| | |
| * | Merge topic 'FixAutomocFromCCMakeFromPATH'David Cole2011-11-081-1/+1
| |\ \ | | | | | | | | | | | | | | | | 83d02ee make automoc work when using ccmake via PATH (#12551)
| | * | make automoc work when using ccmake via PATH (#12551)Alex Neundorf2011-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In ccmake, cmake::GetCMakeCommand() returns "/cmake" when ccmake was started from the PATH, i.e. by simply running "ccmake" Alex
| * | | Merge topic 'watcom-cmake-shortpath-issue-12548'David Cole2011-11-082-17/+26
| |\ \ \ | | | | | | | | | | | | | | | | | | | | 23381d8 Watcom: Use shortpath to CMake if full path has parens (#12548)
| | * | | Watcom: Use shortpath to CMake if full path has parens (#12548)Brad King2011-11-032-17/+26
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Watcom WMake tool has trouble running commands in paths that have parentheses. We already convert most commands to a shortpath for Watcom if the path contains a space, but the use of $(CMAKE_COMMAND) hides the true path from that conversion. Factor the shortpath conversion code out into a new ConvertShellCommand method. Teach it to convert paths that contain parentheses as well as spaces. Use the new method to convert the value of $(CMAKE_COMMAND) and other helper variables.
| * | | Merge topic 'framework-with-space'David Cole2011-11-081-2/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | e74f374 Fix linking to OS X Frameworks named with spaces (#12550)
| | * | | Fix linking to OS X Frameworks named with spaces (#12550)Brad King2011-11-021-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach cmComputeLinkInformation to generate the "-framework" option as a separate link item preceding the actual framework name. Then escape the framework name to pass as an argument through a shell. This fixes the link line for frameworks with spaces in the name. The build system generators that call cli.GetItems() and generate the final list of items on the link line already handle escaping correctly for items that are paths. However, for raw link items like "-lfoo" they just pass through to the command line verbatim. This is incorrect. The generators should escape these items too. Unfortunately we cannot fix that without introducing a new CMake Policy because projects may already be passing raw link flags with their own escapes to work around this bug. Therefore we punt on this bug for now and go with the above fix.
| * | | | Merge topic 'FixTargetsInVirtualFoldersForEclipseIndigo'David Cole2011-11-081-1/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d31b1ac Eclipse: quote the build dir (to make it work with spaces) 0576331 Eclipse: make targets work from any directory
| | * | | | Eclipse: quote the build dir (to make it work with spaces)Alex Neundorf2011-11-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When creating the targets for Eclipse, quote the directory in which make should change. Otherwise it will fail if the path contains with spaces. Alex
| | * | | | Eclipse: make targets work from any directoryAlex Neundorf2011-10-311-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the working directory for make targets which are associated to virtual folders, otherwise Eclipse simply runs make from the current working directory (where Eclipse has been started), and where probably not the correct makefile is located. Alex
| * | | | | Merge topic 'EclipseWarnIfBuildDirIsSubDirOfSrcDir'David Cole2011-11-081-0/+10
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4b93022 Eclipse: warn if CMAKE_BINARY_DIR is subdir of CMAKE_SOURCE_DIR
| | * | | | | Eclipse: warn if CMAKE_BINARY_DIR is subdir of CMAKE_SOURCE_DIRAlex Neundorf2011-11-011-0/+10
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eclipse doesn't handle this case well. When doing out-of-source builds we create a linked resource which points to CMAKE_SOURCE_DIR, so the user can browse the source dir in Eclipse. This is not possible when the build dir is a subdir of the source dir. Alex
| * | | | | Merge topic 'AddMocOptionsToAutomoc'David Cole2011-11-084-1/+38
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2c648ab add documentation for the AUTOMOC_MOC_OPTIONS property 52719a1 automoc: fix #12541, support moc options
| | * | | | | add documentation for the AUTOMOC_MOC_OPTIONS propertyAlex Neundorf2011-11-012-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Alex
| | * | | | | automoc: fix #12541, support moc optionsAlex Neundorf2011-11-013-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds a new target property AUTOMOC_MOC_OPTIONS, which can be set to add extra options for the moc invocations done via automoc. This is equivalent to the OPTIONS parameter in the qt4_wrap_cpp() macro. Alex
| * | | | | | Merge topic 'DontCrashAutomocWithEmptyCompileDefs'David Cole2011-11-081-4/+8
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1ecc55a Automoc: fix the fix, need to use std::string, not just char* pointer 8c8305f don't crash in automoc with empty COMPILE_DEFINITIONS property
| | * | | | | Automoc: fix the fix, need to use std::string, not just char* pointerAlex Neundorf2011-11-011-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to take a copy of the property values, since the returned char* pointer is reused by the following GetProperty() calls Alex
| | * | | | | don't crash in automoc with empty COMPILE_DEFINITIONS propertyAlex Neundorf2011-10-311-7/+8
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reported by Laszlo Papp: http://www.cmake.org/pipermail/cmake/2011-October/047089.html Alex
| * | | | | Merge topic 'fix-12549-one-more-SCC-setting'David Cole2011-11-084-3/+24
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | b0f0b3e VS: Add VS_SCC_AUXPATH target property (#12549)
| | * | | | | VS: Add VS_SCC_AUXPATH target property (#12549)Robert Dailey2011-11-014-3/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Maps to SccAuxPath tag in VCPROJ files.
| * | | | | | Merge topic 'automoc_qt5'David Cole2011-11-081-2/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c208ab8 Also run moc automatically with Qt5.
| * | | | | | | KWSys Nightly Date StampKWSys Robot2011-11-081-1/+1
| | | | | | | |
| * | | | | | | KWSys Nightly Date StampKWSys Robot2011-11-071-1/+1
| | | | | | | |
| * | | | | | | KWSys Nightly Date StampKWSys Robot2011-11-061-1/+1
| | | | | | | |
| * | | | | | | KWSys Nightly Date StampKWSys Robot2011-11-051-1/+1
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | KWSys Nightly Date StampKWSys Robot2011-11-041-1/+1
| | |_|_|_|/ | |/| | | |
| * | | | | KWSys Nightly Date StampKWSys Robot2011-11-031-1/+1
| | |_|_|/ | |/| | |
| * | | | KWSys Nightly Date StampKWSys Robot2011-11-021-1/+1
| | | | |
| * | | | Merge topic 'FixCMAKE_BUILD_TOOL_doc'David Cole2011-11-011-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 83b13a2 Fix old reference to CMAKE_MAKE_PROGRAM inside CMAKE_BUILD_TOOL doc.
| | * | | | Fix old reference to CMAKE_MAKE_PROGRAM inside CMAKE_BUILD_TOOL doc.Eric NOULARD2011-10-301-1/+1
| | | | | |
| * | | | | Merge topic 'doc-link_directories-misconception'David Cole2011-11-011-1/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 30e4a52 Tell people that link_directories() is not what they are searching for
| | * | | | | Tell people that link_directories() is not what they are searching forRolf Eike Beer2011-10-271-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Judging from the questions I see on the #cmake IRC channel this is one of the most common pitfalls for people coming from other build systems, especially plain Makefiles. Finally put this into the documentation to stop people getting fooled into using this. Text by Brad King.
| * | | | | | Merge topic 'fix-12539-ctestconfig-from-build-dir'David Cole2011-11-011-6/+26
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 76ecdd8 CTest: Look for CTestConfig.cmake in build dir first, then source dir
| | * | | | | | CTest: Look for CTestConfig.cmake in build dir first, then source dirJean-Christophe Fillion-Robin2011-10-271-6/+26
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide the ability to configure CTest with settings different from the ones available in the source tree by checking first if CTestConfig.cmake exists in the build tree. The motivation is to allow build system checking out external project to test and/or package them and submit the associated results to a different dashboard than the one specified (or not) in the source of the external project. For example, the build system of Slicer can checkout, build, test and package what I will call "extensions". These extensions can be developed by third parties who can test and submit to their own dashboard / project. When checked out by Slicer build system, the default dashboard can now be overwritten by adding a custom CTestConfig.cmake to the build directory. And if not overwritten, it would avoid to create CTestConfig.cmake within the source checkout of the extension.
| * | | | | | Merge topic 'fix-12383-clear-ctest-vecs'David Cole2011-11-011-0/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 499c104 CTest: Clear custom vectors before populating (#12383)
| | * | | | | | CTest: Clear custom vectors before populating (#12383)David Cole2011-10-261-0/+2
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Important when calling ctest commands in a loop from a script. Each time Populate gets called, it uses the current definition of the variable. Without the clear, it was accumulating additional identical values each time through the loop.
| * | | | | | Merge topic 'ctest-memcheck-log-newline-issue-12538'David Cole2011-11-011-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 26b6794 Source/cmCTest.cxx: Add missing newline (#12538)
| | * | | | | | Source/cmCTest.cxx: Add missing newline (#12538)Bernhard Walle2011-10-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the log entry, the newline is missing. The output without the newline character is a bit strange, like SetCTestConfigurationFromCMakeVariable:MemoryCheckCommand:CTEST_MEMORYCHECK_COMMANDSetCTestConfiguration:MemoryCheckCommand:/usr/bin/valgrind Instead of SetCTestConfigurationFromCMakeVariable:MemoryCheckCommand:CTEST_MEMORYCHECK_COMMAND SetCTestConfiguration:MemoryCheckCommand:/usr/bin/valgrind This patch changes this to add a newline. Signed-off-by: Bernhard Walle <walle@corscience.de>
| * | | | | | | KWSys: Address Intel compiler remarksBrad King2011-11-013-26/+29
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CommandLineArguments.cxx: remark #181: argument is incompatible with corresponding format string conversion SystemInformation.cxx: remark #193: zero used for undefined preprocessing identifier "_WIN32" warning #177: variable "Regebx" was declared but never referenced SystemTools.cxx(375): remark #444: destructor for base class "std::vector<char*>" is not virtual class kwsysDeletingCharVector : private kwsys_stl::vector<char*> Author: Hans Johnson <hans-johnson@uiowa.edu> Change-Id: Ibc899c3ba14990158ef7bbabace4b435b22495c3
| * | | | | | KWSys Nightly Date StampKWSys Robot2011-11-011-2/+2
| | |_|_|_|/ | |/| | | |
| * | | | | KWSys Nightly Date StampKWSys Robot2011-10-311-1/+1
| | |_|/ / | |/| | |
| * | | | KWSys Nightly Date StampKWSys Robot2011-10-301-1/+1
| | | | |
| * | | | KWSys Nightly Date StampKWSys Robot2011-10-291-1/+1
| | | | |
| * | | | KWSys Nightly Date StampKWSys Robot2011-10-281-1/+1
| | | | |
| * | | | KWSys Nightly Date StampKWSys Robot2011-10-271-1/+1
| | |/ / | |/| |
| * | | KWSys Nightly Date StampKWSys Robot2011-10-261-1/+1
| | | |
* | | | Fix style.Stephen Kelly2011-11-091-2/+3
| | | |