summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* KWSys Nightly Date StampKWSys Robot2011-06-161-1/+1
|
* KWSys Nightly Date StampKWSys Robot2011-06-151-1/+1
|
* Merge topic 'library-multiarch-issue-12037'Brad King2011-06-1421-6/+123
|\ | | | | | | | | | | | | 1ed19bc multiarch: Set CMAKE_LIBRARY_ARCHITECTURE_REGEX for Linux|Hurd|kFreeBSD 52a6ed2 Test find_package multiarch support (#12037) b41ad3b Teach find_(library|package) about Linux multiarch (#12037)
| * multiarch: Set CMAKE_LIBRARY_ARCHITECTURE_REGEX for Linux|Hurd|kFreeBSDModestas Vainius2011-06-133-1/+5
| | | | | | | | | | | | | | | | | | * Fix linux CMAKE_LIBRARY_ARCHITECTURE_REGEX to support armel-linux-gnueabi. * Add CMAKE_LIBRARY_ARCHITECTURE_REGEX on kFreeBSD. * Add CMAKE_LIBRARY_ARCHITECTURE_REGEX on GNU (Hurd). Also regex is improved to support quadlets. Even if I have not seen this in the wild yet, reportedly they are possible.
| * Test find_package multiarch support (#12037)Brad King2011-06-087-0/+31
| |
| * Teach find_(library|package) about Linux multiarch (#12037)Brad King2011-06-0812-6/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | Implement support for multiarch as specified here: http://wiki.debian.org/Multiarch https://wiki.ubuntu.com/MultiarchSpec Detect the <arch> part of <prefix>/lib/<arch> from the implicit library search path from each compiler to set CMAKE_<lang>_LIBRARY_ARCHITECTURE. Define CMAKE_LIBRARY_ARCHITECTURE using one of these values (they should all be the same). Teach the find_library and find_package commands to search <prefix>/lib/<arch> whenever they would search <prefix>/lib.
* | Merge topic '10997_PROTOBDUF_GENERATE_CPP_returns_wrong_path'Brad King2011-06-141-2/+22
|\ \ | | | | | | | | | | | | 3982603 10997: PROTOBUF_GENERATE_CPP now supports proto files outside current dir
| * | 10997: PROTOBUF_GENERATE_CPP now supports proto files outside current dirPhilip Lowman2011-06-141-2/+22
| | |
* | | Merge topic 'qt4-import-targets-mac'Brad King2011-06-141-23/+24
|\ \ \ | | | | | | | | | | | | | | | | e7f05d9 Add imported targets support for frameworks on Mac.
| * | | Add imported targets support for frameworks on Mac.Clinton Stimpson2011-06-131-23/+24
| | | |
* | | | Merge topic 'qt4-useqt-module-deps'Brad King2011-06-141-0/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 5f983d1 Qt4: complete module dependencies in UseQt4.cmake
| * | | | Qt4: complete module dependencies in UseQt4.cmakeClinton Stimpson2011-06-131-0/+7
| |/ / /
* | | | Merge topic 'gnu-isystem-flag-issue-12258'Brad King2011-06-141-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 33f5a83 GNU: Fix CMAKE_INCLUDE_SYSTEM_FLAG_<lang> value (#12258)
| * | | | GNU: Fix CMAKE_INCLUDE_SYSTEM_FLAG_<lang> value (#12258)Brad King2011-06-131-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo introduced by commit e28c16b4 (Split GNU compiler information files, 2009-12-02). Reported-by: Campbell Barton <ideasman42@gmail.com> Suggested-by: Michael Hertling <mhertling@online.de>
* | | | Merge topic 'ImproveCPackRPMdoc'Brad King2011-06-141-3/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 2af80c7 Add some more Specs file tag handling. 05720c7 CPackRPM: Enhance documentation
| * | | | Add some more Specs file tag handling.Eric NOULARD2011-06-121-1/+5
| | | | |
| * | | | CPackRPM: Enhance documentationEric NOULARD2011-06-121-2/+8
| | | | |
* | | | | Merge topic 'ctest-no-config-report-notrun'Brad King2011-06-147-3/+61
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a4ec242 CTest: Report tests not run due to unknown configuration 77ddb6a Use cascading-if for per-config test and install code
| * | | | | CTest: Report tests not run due to unknown configurationBrad King2011-06-105-1/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When add_test(NAME) is called without the CONFIGURATIONS argument then the test is intended to run in any configuration. In multi-config generators like the VS IDE and Xcode tests created by add_test(NAME) can only be run when testing a known configuration (otherwise there is no way to generate the test command line). If no test command line is known for a particular configuration, or if no configuration is given to ctest, report the test as not run instead of silently skipping it. Also fix CMake's own TestsWorkingDirectory test invocation to correct a previously silent failure exposed by this change.
| * | | | | Use cascading-if for per-config test and install codeBrad King2011-06-102-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When generating per-config blocks in test and install scripts replace the form IF() # config == A ENDIF() IF() # config == B ENDIF() with IF() # config == A ELSEIF() # config == B ELSE() # no config matches ENDIF() for clarity and to support the else() case cleanly.
* | | | | | KWSys Nightly Date StampKWSys Robot2011-06-141-1/+1
| |_|/ / / |/| | | |
* | | | | KWSys Nightly Date StampKWSys Robot2011-06-131-1/+1
| |/ / / |/| | |
* | | | KWSys Nightly Date StampKWSys Robot2011-06-121-1/+1
| | | |
* | | | KWSys Nightly Date StampKWSys Robot2011-06-111-1/+1
| | | |
* | | | KWSys Nightly Date StampKWSys Robot2011-06-101-1/+1
|/ / /
* | | KWSys Nightly Date StampKWSys Robot2011-06-091-1/+1
| | |
* | | Merge topic 'xcode-source_groups-folders-issue-10039'Brad King2011-06-085-62/+126
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | f09ba0f Fix style errors added by parent and grandparent eeeeca1 XCode: Support target folders on XCode. 59ed84e Xcode: Support multiple level nesting of XCode folders (#10039) d0a403f CMake: Move tokenize to cmSystemTools
| * | | Fix style errors added by parent and grandparentBrad King2011-06-082-4/+8
| | | |
| * | | XCode: Support target folders on XCode.Johan Björk2011-06-071-11/+39
| | | |
| * | | Xcode: Support multiple level nesting of XCode folders (#10039)Johan Björk2011-06-072-22/+50
| | | |
| * | | CMake: Move tokenize to cmSystemToolsJohan Björk2011-06-073-32/+36
| | | |
* | | | Merge topic 'fix_vs10_custom_command_rulefiles'Brad King2011-06-081-0/+11
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | 9d406cd Fix for bug #11927, external project git clone step always runs vs10.
| * | | Fix for bug #11927, external project git clone step always runs vs10.Bill Hoffman2011-06-071-0/+11
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | In cmMakefile.cxx GetCMakeCFGInitDirectory is replaced with GetCMakeFilesDirectory for .rule files. In some cases with external projects, that directory will not exist. With vs10 the .rule files must exist or the rule will run with every build. This fix creates the path that the .rule file is in. In addition, it is now a CMake error if the .rule file can not be created.
* | | KWSys Nightly Date StampKWSys Robot2011-06-081-1/+1
| | |
* | | Merge topic 'eliminate-cvs-from-release-scripts'Brad King2011-06-0711-40/+44
|\ \ \ | | | | | | | | | | | | | | | | b43af94 CMake: eliminate use of cvs in the Release scripts
| * | | CMake: eliminate use of cvs in the Release scriptsDavid Cole2011-06-0211-40/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set GIT_COMMAND to "git" -- each machine involved in building the CMake release binaries has the right "git" in the PATH. Separate the release scripts into two batches so we can build multiple releases on the same machine, in serial, if necessary. We currnetly do this with the Windows and Cygwin release binaries on dash2win64. Sort the files to be uploaded, so that sorting them by modification time (file copy / upload time) is equivalent to sorting them alphabetically.
* | | | Merge topic 'fix-12034-fixup-bundle-with-non-dotapp-exe'Brad King2011-06-0715-29/+333
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 51e16c0 BundleUtilities: Avoid test on Watcom dashboards (#12034) 41f962a Revert "BundleUtilities: Run test on Windows if either MSVC or dumpbin was found." e17135e BundleUtilities: Add rpath to loadable modules in test. 8064044 BundleUtilities: Print reason for not loading module.so f3de459 BundleUtilities: Run test on Windows if either MSVC or dumpbin was found. 900bf98 BundleUtilities: Disable running test on Windows unless using MSVC. fa4dc08 BundleUtilities: Fix issues with custom target DEPENDS in test (#12034) e40b79e BundleUtilities: Fix test when using xcode (#12034) b68d3dc BundleUtilities: Fix regex to extract dependents from ldd (#12034) 7ac7b43 BundleUtilities: Work w/ non .app exes on Mac (#12034)
| * | | | BundleUtilities: Avoid test on Watcom dashboards (#12034)David Cole2011-06-041-3/+3
| | | | |
| * | | | Revert "BundleUtilities: Run test on Windows if either MSVC or dumpbin was ↵Clinton Stimpson2011-06-021-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | found." This reverts commit f3de459cec78eac3a7081379b6ee9c6cde36bb60. There are some platforms without MSVC where this test doesn't work well. We can look into these later.
| * | | | BundleUtilities: Add rpath to loadable modules in test.Clinton Stimpson2011-06-023-25/+70
| | | | |
| * | | | BundleUtilities: Print reason for not loading module.soClinton Stimpson2011-06-011-3/+7
| | | | |
| * | | | BundleUtilities: Run test on Windows if either MSVC or dumpbin was found.Clinton Stimpson2011-06-011-2/+4
| | | | |
| * | | | BundleUtilities: Disable running test on Windows unless using MSVC.Clinton Stimpson2011-06-011-3/+3
| | | | |
| * | | | BundleUtilities: Fix issues with custom target DEPENDS in test (#12034)Clinton Stimpson2011-05-314-3/+11
| | | | |
| * | | | BundleUtilities: Fix test when using xcode (#12034)Clinton Stimpson2011-05-311-1/+1
| | | | |
| * | | | BundleUtilities: Fix regex to extract dependents from ldd (#12034)Clinton Stimpson2011-05-311-1/+1
| | | | | | | | | | | | | | | | | | | | This regex works with spaces in the path.
| * | | | BundleUtilities: Work w/ non .app exes on Mac (#12034)Clinton Stimpson2011-05-2714-28/+275
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add a test of BundleUtilities including an exe, some shared libs, a plugin, and a framework-style lib. This test presently runs (and this functionality works) on Linux, Mac and Windows. For now, the framework-style lib is built as a plain old shared lib because there is another yet-unresolved issue with local frameworks without rpaths on the Mac.
* | | | | Merge topic 'fix-BundleUtilities-cryptic-error-message'Brad King2011-06-071-3/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 8f0667c BundleUtilities: Avoid a cryptic and unhelpful error message
| * | | | | BundleUtilities: Avoid a cryptic and unhelpful error messageDavid Cole2011-06-021-3/+15
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the path to "resolved_embedded_item" was shorter than the path to the bundle being fixed up, fixup_bundle would fail with a cmake error like: "string end index: 110 is out of range 0 - 85" Detect when the path of resolved_embedded_item is too short to be embedded in the bundle, and report the proper error message, so the poor developer reading it has a snowball's chance of actually fixing the issue.
* | | | | Merge topic 'vs10_include_fix'Brad King2011-06-074-1/+74
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 27aa446 One more try. Use full path by default, and relative on broken compilers. 2dfc121 Use bin tree for inclues to avoid -I with spaces in the path. 6d29b4b Append and do not clobber CMAKE_CXX_FLAGS in the test. 7815e90 Fix for bug#10798. VS10 did not append -I flags with COMPILE_FLAGS prop.