summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'fix-11213-vs10-mfc-support'David Cole2011-11-156-47/+109
|\ | | | | | | | | | | | | | | | | 537020f Tests: Nudge MFC test to pass on VS 6 dashboards (#11213) 51f442e VS11: Update InstallRequiredSystemLibraries.cmake for VS11 (#11213) d85ab7a Tests: Add environment logging to the MFC test (#11213) 011694c VS10: Use expected values for UseOfMfc (#11213) a2e6d24 Tests: Fix MFC test to work with VS 10 and later (#11213)
| * Tests: Nudge MFC test to pass on VS 6 dashboards (#11213)David Cole2011-11-093-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | InstallRequiredSystemLibraries does not install any dlls when used with VS 6 dashboards. Modify the ValidateBuild script to expect only 1 file when building with VS 6. Using "-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>" does not work when <INSTALL_DIR> evaluates to a long enough string. However, using "-DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>" does work, even with the longer strings. So: make sure to include the ":PATH" when using this construct with ExternalProject calls so that they may install to the proper location on VS 6 builds. All existing calls that match "CMAKE_INSTALL_PREFIX.*INSTALL_DIR" include the ":PATH" after this commit. By the way: https://twitter.com/DLRdave/status/134339505397309440
| * VS11: Update InstallRequiredSystemLibraries.cmake for VS11 (#11213)David Cole2011-11-081-38/+58
| | | | | | | | Should fix the newly added MFC test on VS11 dashboards.
| * Tests: Add environment logging to the MFC test (#11213)David Cole2011-11-081-0/+11
| | | | | | | | Simply to ease analyzing still-occurring dashboard failures.
| * VS10: Use expected values for UseOfMfc (#11213)David Cole2011-11-041-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use expected values for the UseOfMfc xml element in VS 10 .vcxproj files. CMAKE_MFC_FLAG=1 maps to "Static" CMAKE_MFC_FLAG=2 maps to "Dynamic" all other values map to "false" Thanks to Randy Schott and McBen for their patches which served as inspiration and motivation for getting this done. See also http://public.kitware.com/Bug/view.php?id=11224
| * Tests: Fix MFC test to work with VS 10 and later (#11213)David Cole2011-11-041-0/+15
| | | | | | | | | | | | | | | | | | | | | | The mfc app in the test was generated by the VS 7.1 wizard, and due to changes in VS since then, the values used for WINVER and _WIN32_WINNT caused compile errors when built with VS 10 or later. Change them to values appropriate for targeting Windows XP or later when building with VS 10 or later. See http://msdn.microsoft.com/en-us/library/6sehtctf.aspx for more info.
* | Merge topic 'add-mfc-test'David Cole2011-11-1528-0/+1778
|\ \ | |/ | | | | | | | | | | | | | | c71f7ab Tests: Avoid MFC test automatically for Watcom WMake builds (#11213) a42e3f2 Tests: Fix MFC test for old vs6 dashboards (#11213) b297da6 Tests: Fix MFC test w/ Make-based generators (#11213) 54595e6 Tests: Avoid MFC test automatically for VCExpress builds (#11213) 36b0c43 Tests: Add the MFC test (#11213)
| * Tests: Avoid MFC test automatically for Watcom WMake builds (#11213)David Cole2011-11-031-0/+10
| |
| * Tests: Fix MFC test for old vs6 dashboards (#11213)David Cole2011-11-031-1/+7
| | | | | | | | | | | | | | | | The MFC test's mfc1 directory was a "VS-MFC-wizard-generated" starter MFC app, using VS 7.1 as the generator. There's one define used in the generated rc file that was not available back in the VS6 days... Put a conditional define in here based on _MSC_VER to enable the test app to build on VS6 dashboards.
| * Tests: Fix MFC test w/ Make-based generators (#11213)David Cole2011-11-021-0/+12
| | | | | | | | | | An explicit add_definitions of _AFXDLL is required for shared library builds with non-Visual Studio generators.
| * Tests: Avoid MFC test automatically for VCExpress builds (#11213)David Cole2011-11-011-0/+24
| |
| * Tests: Add the MFC test (#11213)David Cole2011-11-0128-0/+1726
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build a simple, do-nothing VS 7.1 MFC wizard generated app with CMake. Build it two different ways via ExternalProject, one with CMAKE_MFC_FLAG set to 1 for linking to MFC statically, and one with CMAKE_MFC_FLAG set to 2 for linking to the shared MFC dlls. Validate that the install tree of the static build has only one *.exe file in it and nothing else. Also validate that the install tree of the shared library build has multiple files in it (no less than 3) and that they are only of the expected types *.exe, *.dll and *.manifest. This commit does not address the issue reported in #11213, it merely adds a test that may be used to show that the bug report is valid. After this commit, the MFC test should fail on any dashboard machines that have MSVC defined, but cannot build an MFC app. We can then analyze that failure data as input to solving the issue.
* | 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
| |_|_|_|_|/ / |/| | | | | |
generated by cgit v0.12 at 2025-09-11 18:41:25 (GMT)