summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'findx11-dan-kegel-patch'David Cole2011-11-151-0/+9
|\ | | | | | | | | 0e721e5 Modules: Add XRes to FindX11.cmake
| * Modules: Add XRes to FindX11.cmakeDan Kegel2011-11-091-0/+9
| |
* | KWSys Nightly Date StampKWSys Robot2011-11-141-1/+1
| |
* | KWSys: Fix wrong spelling of __INTEL_COMPILERBrad King2011-11-131-6/+1
| | | | | | | | | | Author: Hans Johnson <hans-johnson@uiowa.edu> Change-Id: I31a29a8b53e5262b76530b8ea80a1a66cff7b3f7
* | KWSys: Remove trailing whitespace in SystemTools.cxxBrad King2011-11-131-128/+128
| |
* | KWSys Nightly Date StampKWSys Robot2011-11-131-1/+1
| |
* | KWSys Nightly Date StampKWSys Robot2011-11-111-1/+1
| |
* | KWSys Nightly Date StampKWSys Robot2011-11-101-1/+1
|/
* KWSys Nightly Date StampKWSys Robot2011-11-091-1/+1
|
* Merge topic 'CPackRPM-fix12556'David Cole2011-11-081-3/+29
|\ | | | | | | | | 9066886 CPackRPM fix #12556 and enhance documentation
| * CPackRPM fix #12556 and enhance documentationEric NOULARD2011-11-051-3/+29
| | | | | | | | Inspired-By: Chip Christian
* | 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-085-1/+39
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-014-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | Also run moc automatically with Qt5.Stephen Kelly2011-11-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The method of running moc hasn't changed in 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 'qt4-deploy-module'David Cole2011-11-011-7/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 467ee36 Check plugin variables are defined before warning. 4571ea6 Don't resolve directories; are never relative. 9cfc920 Match fixup_qt4_executable with documentation.
| * | | | Check plugin variables are defined before warning.Mike McQuaid2011-11-011-3/+5
| | | | |
| * | | | Don't resolve directories; are never relative.Mike McQuaid2011-11-011-2/+0
| | | | |
| * | | | Match fixup_qt4_executable with documentation.Mike McQuaid2011-11-011-2/+3
| | | | |
* | | | | 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 'CPackRPM-perComponentHeader'David Cole2011-11-013-6/+35
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | e20c59a CPackRPM support component specific variables for spec files
| * | | | | | CPackRPM support component specific variables for spec filesEric NOULARD2011-10-303-6/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a modified version of a user patch Inspired-By: informant
* | | | | | | 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