summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'aix-gnu-asm'David Cole2012-07-121-0/+2
|\ | | | | | | | | 7755283 Add ASM platform information for GNU compiler on AIX (#13390)
| * Add ASM platform information for GNU compiler on AIX (#13390)Brad King2012-07-101-0/+2
| | | | | | | | | | | | | | Among other flags this sets RPATH flags correctly so that CMake knows how to treat CMAKE_PLATFORM_REQUIRED_RUNTIME_PATH for the ASM language. This is the GNU compiler equivalent to commit a0bab7ae (Add ASM platform information for XL compiler on AIX, 2011-03-02), made for XL.
* | Merge topic 'include-command-empty-filename'David Cole2012-07-128-0/+27
|\ \ | | | | | | | | | | | | 2e99949 include: Ignore empty string as file name (#13388)
| * | include: Ignore empty string as file name (#13388)Brad King2012-07-108-0/+27
| |/ | | | | | | | | | | | | | | | | Previously CMake silently accepted the empty string and added a bogus dependency on the current directory. Instead warn about the empty file name and ignore it. We cannot make this an error because there may be existing projects that accidentally depend on the old behavior. Add a RunCMake.include test to cover this case.
* | Merge topic 'aix-GNU-shared-libs'David Cole2012-07-121-1/+2
|\ \ | | | | | | | | | | | | 767a7ad AIX-GNU: Link shared libs with -brtl,-bnoipath (#13352)
| * | AIX-GNU: Link shared libs with -brtl,-bnoipath (#13352)Brad King2012-07-091-1/+2
| | | | | | | | | | | | We already use these flags with the XL toolchain. Use them for GNU too.
* | | Merge topic 'fix-CustomCommand-main'David Cole2012-07-121-1/+1
|\ \ \ | | | | | | | | | | | | | | | | d54618f Tests/CustomCommand: Do not use 'main' in a library
| * | | Tests/CustomCommand: Do not use 'main' in a libraryBrad King2012-07-091-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | Otherwise when linking 'CustomCommand' some linkers report ld: 0711-224 WARNING: Duplicate symbol: .main Suggested-by: Daniel R. Gomez <gomez@teragram.com>
* | | Merge topic 'deploy-qt4-workaround-bug-13258'David Cole2012-07-121-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 374b9b9 DeployQt4: workaround bug 13258 where ARGV1 is leaked into a sub function.
| * | | DeployQt4: workaround bug 13258 where ARGV1 is leaked into a sub function.Clinton Stimpson2012-07-091-1/+1
| |/ /
* | | Merge topic 'fix-CTestUpdateSVN-svn1.7'David Cole2012-07-121-1/+0
|\ \ \ | | | | | | | | | | | | | | | | c785c6b CTestUpdateSVN: Do not create repo directory first (#13349)
| * | | CTestUpdateSVN: Do not create repo directory first (#13349)Brad King2012-07-091-1/+0
| |/ / | | | | | | | | | | | | | | | | | | | | | If the directory already exists some svnadmin versions report svnadmin: E200011: Repository creation failed svnadmin: E200011: Could not create top-level directory svnadmin: E200011: '.../CTest UpdateSVN/repo' exists and is non-empty
* | | Merge topic 'inject_code_via_variable'David Cole2012-07-121-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 280a333 Fix project command documentation typo (#13384)
| * | | Fix project command documentation typo (#13384)Brad King2012-07-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 9090572f (Add ability to include a file in a project via a cache variable, 2012-02-17) taught the project() command to check variable "CMAKE_PROJECT_<projectName>_INCLUDE" but the documentation included an extra "_FILE" by accident. Remove it.
* | | | CMake Nightly Date StampKitware Robot2012-07-121-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2012-07-111-1/+1
| |_|/ |/| |
* | | CMake Nightly Date StampKitware Robot2012-07-101-1/+1
| | |
* | | Merge topic 'cmake-gui-locale'David Cole2012-07-096-86/+90
|\ \ \ | | | | | | | | | | | | | | | | ecfc53d cmake-gui: Fix code to respect current locale.
| * | | cmake-gui: Fix code to respect current locale.Clinton Stimpson2012-07-066-86/+90
| | | | | | | | | | | | | | | | | | | | This means non-ascii characters now work correctly on systems that have a non-ascii 8 bit encoding as the current locale.
* | | | Merge topic 'ninja-fixes'David Cole2012-07-093-3/+25
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6b31d39 Ninja: don't shadow 'outputs' variable 9b311fb Ninja: add soname test case e3b1be2 Ninja: Clean all symlink created for libraries. 990f77e Ninja: remove int/size_t warning
| * | | | Ninja: don't shadow 'outputs' variablePeter Kuemmel2012-07-091-4/+4
| | | | |
| * | | | Ninja: add soname test casePeter Kuemmel2012-07-091-0/+13
| | | | |
| * | | | Ninja: Clean all symlink created for libraries.Nicolas Despres2012-07-091-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'ninja -t clean' only cleans built output and dep files so all file created as a side effect and not mentioned in the 'build' statement would be omitted.
| * | | | Ninja: remove int/size_t warningPeter Kuemmel2012-07-091-1/+1
| | | | |
* | | | | Merge topic 'ninja-cmdLineLimit'David Cole2012-07-094-21/+30
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | 6332ba5 Ninja: also consider rule command length for rsp file 0c42faf Ninja: also consider variables when checking command line length
| * | | | Ninja: also consider rule command length for rsp filePeter Kuemmel2012-07-023-1/+9
| | | | |
| * | | | Ninja: also consider variables when checking command line lengthPeter Kuemmel2012-07-012-20/+21
| | | | |
* | | | | Merge topic 'getprerequisites-pie-executables'David Cole2012-07-091-0/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ac7a193 GetPrerequisites.cmake: detect executables built with the -pie linker flag.
| * | | | | GetPrerequisites.cmake: detect executables built with the -pie linker flag.Clinton Stimpson2012-07-051-0/+8
| | |/ / / | |/| | |
* | | | | Merge topic 'CPack-honorCPACK_XXX-valuesInScriptFile'David Cole2012-07-092-3/+24
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 05a8630 Do not provide defaul value for CPACK_PACKAGE_DIRECTORY if found in config.
| * | | | | Do not provide defaul value for CPACK_PACKAGE_DIRECTORY if found in config.Eric NOULARD2012-07-042-3/+24
| | | | | | | | | | | | | | | | | | | | | | | | This fixes bug #0012906.
* | | | | | Merge topic 'CPack-fixRegressionCPackWithNoArgs'David Cole2012-07-091-2/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 926d634 CPack fix regression between 2.8.7 and 2.8.8 when running cpack with no arg.
| * | | | | | CPack fix regression between 2.8.7 and 2.8.8 when running cpack with no arg.Eric NOULARD2012-07-031-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 2.8.7 running cpack with no arguments would run the packaging iff a CPackConfig.cmake file is found whereas In 2.8.8 it displays the help. This commit restore the 2.8.7. We should add a test for this but this is not included in this commit.
* | | | | | | Merge topic 'FindBoostNotFoundBug'David Cole2012-07-091-119/+109
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ca90709 FindBoost: Future proof to 1.56 accd042 FindBoost: Fix bug where Boost_FOUND could be false when version specified
| * | | | | | | FindBoost: Future proof to 1.56Philip Lowman2012-06-301-1/+4
| | | | | | | |
| * | | | | | | FindBoost: Fix bug where Boost_FOUND could be false when version specifiedPhilip Lowman2012-06-301-118/+105
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a problem where when specifying a version number without the REQUIRED parameter, Boost_FOUND would be true on the first configure but false on subsequent configures.
* | | | | | | Merge topic 'make_cldep_use_cmake_process_exec'David Cole2012-07-092-488/+32
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 24a35ce Ninja: print error message when command failed 5f12424 Remove process execution code from cmcldeps and have it use cmake code.
| * | | | | | | Ninja: print error message when command failedPeter Kuemmel2012-06-281-17/+8
| | | | | | | |
| * | | | | | | Remove process execution code from cmcldeps and have it use cmake code.Bill Hoffman2012-06-272-482/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This simplifies the code in cmcldeps and avoids having yet another set of process execution code.
* | | | | | | | Merge topic 'variable-doc-spaces'David Cole2012-07-091-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ee158b3 fix 2 space bugs in variable documentation
| * | | | | | | | fix 2 space bugs in variable documentationRolf Eike Beer2012-06-271-2/+2
| | | | | | | | |
* | | | | | | | | Merge topic 'fix-pie-clang-trunk'David Cole2012-07-091-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9235603 Fix PositionIndependentTargets test with clang trunk.
| * | | | | | | | | Fix PositionIndependentTargets test with clang trunk.Stephen Kelly2012-06-271-2/+2
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The __PIE__ define might be set instead of __PIC__ if fPIE is used. http://llvm.org/bugs/show_bug.cgi?id=13221
* | | | | | | | | Merge topic 'fix-typo'David Cole2012-07-091-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b163c45 Ninja: Fix typo: tagets -> targets
| * | | | | | | | | Ninja: Fix typo: tagets -> targetsDavid Cole2012-06-261-1/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Claus Klein for the report on the mailing list.
* | | | | | | | | Merge topic 'EclipseFixIncludeDirDetectionMinGW'David Cole2012-07-091-18/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d7bc8dd Eclipse: fix #13313, always set LANG to C, also if unset
| * | | | | | | | | Eclipse: fix #13313, always set LANG to C, also if unsetAlex Neundorf2012-06-251-18/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise include dir detection does not work with MinGW on french systems. Alex
* | | | | | | | | | Merge topic 'FindJava-version'David Cole2012-07-091-3/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 304562e FindJava: improve version matching (#12878)
| * | | | | | | | | | FindJava: improve version matching (#12878)Rolf Eike Beer2012-06-251-3/+3
| |/ / / / / / / / /
* | | | | | | | | | Merge topic 'ctest-cmd-line-vars'David Cole2012-07-096-30/+116
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 361696a CTest: Add test to verify -D variable definitions work c77b57b CTest: Allow -Dvar=value with no space between the D and the var 93d084c CTest: Extend -D command line arg handling for variable definitions af29848 CTest: Rename local variable for clarity 24ba0fd CTest: Refactor error output into ErrorMessageUnknownDashDValue