summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'EclipseImprovedSourceProject'David Cole2011-11-221-2/+2
|\ | | | | | | | | | | 982b766 Eclipse: use new variable CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT 1110e45 Eclipse: create links to subprojects also in the source-project (#12579)
| * Eclipse: use new variable CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECTAlex Neundorf2011-11-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Previously ECLIPSE_CDT4_GENERATE_SOURCE_PROJECT was used, but the new name CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT is more in line with the general naming conventions in cmake, and, more importantly IMO, in cmake-gui it now appears right next to the other eclipse-related variables, which all start with CMAKE_ECLIPSE_. A warning is printed if the old variable is TRUE and the new one isn't, so users should notice that they have to enable the new one. Alex
* | Merge topic 'FindPNG_Provide_PNG_INCLUDE_DIRS_Variable'David Cole2011-11-221-6/+11
|\ \ | | | | | | | | | | | | df0f302 FindPNG: provide PNG_INCLUDE_DIRS, as the readme.txt says (#11312)
| * | FindPNG: provide PNG_INCLUDE_DIRS, as the readme.txt says (#11312)Alex Neundorf2011-11-181-6/+11
| |/ | | | | | | | | | | Also improve the documentation a bit. Alex
* | Merge topic 'FindBISON-version-regex'David Cole2011-11-221-2/+11
|\ \ | | | | | | | | | | | | | | | 20cb5ed FindBISON: Fix matching output of "bison --version" f30f9a5 FindBISON: Fix bison++ version parsing to avoid "Offending entry"
| * | FindBISON: Fix matching output of "bison --version"Rolf Eike Beer2011-11-181-2/+2
| | | | | | | | | | | | | | | The output may contain semicolons, which will confuse the IF() because of missing quoting.
| * | FindBISON: Fix bison++ version parsing to avoid "Offending entry"Ondrej Balaz2011-11-111-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've just found out that use of FindBISON.cmake shipped with CMake 2.8 on system where bison++ is default bison executable (e.g. Debian Linux) will result in corrupted CMakeCache.txt file and parse error due to "Offending entry" As FindBISON.cmake logic used to obtain installed bison executable version is tailored to match only the message used in GNU Bison it fails on absolutely different Bison++ version message and whole version message including \n characters is stored into BISON_VERSION which is then dumped into CMakeCache.txt, so everything after first \n character makes "Offending entry".
* | | Merge topic 'FixGettextPoProcessingWithMultipleDots'David Cole2011-11-221-6/+9
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | 65dde30 FindGettext: two more fixes for files with multiple dots e48fcff -make GETTEXT_PROCESS_PO_FILES() work with files with multiple dots ecb4459 Strip trailing whitespace
| * | FindGettext: two more fixes for files with multiple dotsAlex Neundorf2011-11-161-2/+4
| | | | | | | | | | | | | | | | | | | | | Another patch by Albert Astals Cid for dealing with translation files with multiple dots. Alex
| * | -make GETTEXT_PROCESS_PO_FILES() work with files with multiple dotsAlex Neundorf2011-11-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch by Albert Astals Cid. E.g. plasma_package_org.kde.activityswitcher.po will now be installed correctly as plasma_package_org.kde.activityswitcher.mo, and not as plasma_package_org.mo. This is kind-of related to #12282 Alex
| * | Strip trailing whitespaceAlex Neundorf2011-11-151-3/+3
| |/ | | | | | | Alex
* | Merge topic 'qt4-deploy-module'David Cole2011-11-151-1/+5
|\ \ | | | | | | | | | | | | b688f11 Check QtCore without warning.
| * | Check QtCore without warning.Mike McQuaid2011-11-141-1/+5
| | | | | | | | | | | | | | | When debug and release versions of QtCore were available it printed a warning. This has been fixed.
* | | Merge topic 'FindBoost-vs11-issue-12568'David Cole2011-11-151-4/+6
|\ \ \ | | | | | | | | | | | | | | | | 1c4ba48 FindBoost: Use MSVC11 to find Boost on Windows (#12568)
| * | | FindBoost: Use MSVC11 to find Boost on Windows (#12568)Mateusz Loskot2011-11-101-4/+6
| | | | | | | | | | | | | | | | While at it, add recent Boost versions.
* | | | Merge topic 'automoc_qt5'David Cole2011-11-151-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bafe5cc Fix style. 74b9392 Update comments and method names to not be Qt4 specific. 812dab0 Don't assume the existence of QT_MAJOR_VERSION.
| * | | | Don't assume the existence of QT_MAJOR_VERSION.Stephen Kelly2011-11-091-0/+1
| | | | | | | | | | | | | | | | | | | | Also handle Qt5SrcTools_MAJOR_VERSION.
* | | | | Merge topic 'fix-11213-vs10-mfc-support'David Cole2011-11-151-38/+58
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| * | | | | VS11: Update InstallRequiredSystemLibraries.cmake for VS11 (#11213)David Cole2011-11-081-38/+58
| | | | | | | | | | | | | | | | | | | | | | | | Should fix the newly added MFC test on VS11 dashboards.
* | | | | | Modules: Add XRes to FindX11.cmakeDan Kegel2011-11-091-0/+9
| |_|_|_|/ |/| | | |
* | | | | 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 'AddMocOptionsToAutomoc'David Cole2011-11-081-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | 2c648ab add documentation for the AUTOMOC_MOC_OPTIONS property 52719a1 automoc: fix #12541, support moc options
| * | | | | automoc: fix #12541, support moc optionsAlex Neundorf2011-11-011-0/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 '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 'CPackRPM-perComponentHeader'David Cole2011-11-011-6/+33
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | e20c59a CPackRPM support component specific variables for spec files
| * | | | CPackRPM support component specific variables for spec filesEric NOULARD2011-10-301-6/+33
| |/ / / | | | | | | | | | | | | | | | | This is a modified version of a user patch Inspired-By: informant
* | | | FindLibXslt: also search libexslt and xsltprocAlex Neundorf2011-10-251-4/+19
|/ / / | | | | | | | | | | | | | | | merging some changes FindLibXslt.cmake from KDE Alex
* | | Merge topic 'some-documentation-fixes'David Cole2011-10-251-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ceff6ec ccmake: Factor toggle key help instructions. 19da106 ccmake: Document '/' key. fd63219 ccmake: Align 'g' and 'q' key instructions. bfb0ed4 Usage: Add missing exepath argument in get_prerequisites documentation. de51264 Usage: Print help, version and copyright options in usage information. 9ae0604 Usage: Document all options printing the version number. 3353d84 Usage: Document all options printing usage information. 1b612ca Usage: Document -j|--parallel option in help message. 6be15ed Doxygen: Remove dependency on VTK when building doxygen. a92f14f Doxygen: Fix warnings. faede37 Doxygen: Generate call graph and relationships. dd13ecd Doxygen: Improve code documentation. d0b3a7f Fix typo. d3d7e45 Remove trailing white-spaces.
| * | | Usage: Add missing exepath argument in get_prerequisites documentation.Nicolas Despres2011-10-231-1/+1
| |/ /
* | | Merge topic 'SourceGroupsForEclipse'David Cole2011-10-251-1/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 66bd543 Eclipse: fix #12417, don't create wrong src pathentries 70de8bd Eclipse: detect number of CPUs, set CMAKE_ECLIPSE_MAKE_ARGUMENTS accordigly 117f2b8 Eclipse: add Build and Clean targets to targets c3f30bd Eclipse: move code for generating links to targets into separate function cef6bd9 Eclipse: move code for generating links to projects into separate function b6d4de7 Eclipse: add virtual folder for each target
| * | | Eclipse: detect number of CPUs, set CMAKE_ECLIPSE_MAKE_ARGUMENTS accordiglyAlex Neundorf2011-10-231-1/+13
| |/ / | | | | | | | | | | | | | | | | | | Using the new module ProcessorCount.cmake now the number of CPUs is detected, and if it is bigger than 1, make -jX is set accordingly. Alex
* | | Merge topic 'fix-12490-shorten-gcov-filenames'David Cole2011-10-252-1/+7
|\ \ \ | | | | | | | | | | | | | | | | 2f309cb CTest: Add COVERAGE_EXTRA_FLAGS cache variable (#12490)
| * | | CTest: Add COVERAGE_EXTRA_FLAGS cache variable (#12490)David Cole2011-10-222-1/+7
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | COVERAGE_EXTRA_FLAGS is a space separated value of extra flags that will be passed to gcov when ctest's coverage handler invokes gcov to do coverage analysis. Map to CoverageExtraFlags in the CTest ini file. Use default value of "-l" to match the coverage handler's earlier behavior from ctest 2.8.4 and earlier. The fix for related issue #11717 had added a " -p" which was the cause of both #12415 and #12490. Here, we revert that change to the default value, so -p is no longer there by default. The people that care to add -p may do so in their own build trees by appending " -p" to the new cache variable COVERAGE_EXTRA_FLAGS.
* | | Merge topic 'qt4-deploy-module'David Cole2011-10-253-0/+284
|\ \ \ | |/ / |/| | | | | | | | | | | 0618045 Add DeployQt4 module. cf4b529 Add QT_LIBRARIES_PLUGINS variable to UseQt4.
| * | Add DeployQt4 module.Mike McQuaid2011-10-031-0/+274
| | | | | | | | | | | | | | | Add a module that gives better support to BundleUtilities to handle Qt plugins and deploy Qt applications.
| * | Add QT_LIBRARIES_PLUGINS variable to UseQt4.Mike McQuaid2011-10-032-0/+10
| |/
* | Merge topic 'DetectEclipseVersion'David Cole2011-10-181-0/+37
|\ \ | | | | | | | | | | | | | | | | | | | | | dcd2459 Eclipse: better message when Eclipse version could not be determined b4b2fc3 Eclipse: don't create VirtualFolders if not supported 5b200e3 Detect whether the current Eclipse version supports VirtualFolders 4974ec9 Eclipse generator: detect Eclipse version
| * | Eclipse: better message when Eclipse version could not be determinedAlex Neundorf2011-10-151-7/+7
| | | | | | | | | | | | Alex
| * | Eclipse generator: detect Eclipse versionAlex Neundorf2011-10-151-0/+37
| | | | | | | | | | | | | | | | | | Try to detect the eclipse version and put it in the cache. Alex
* | | Merge topic 'FindProtoBuf_doc_clarify'David Cole2011-10-181-1/+5
|\ \ \ | | | | | | | | | | | | | | | | a481d84 FindProtoBuf: Documented limitation of the public macro
| * | | FindProtoBuf: Documented limitation of the public macroPhilip Lowman2011-10-131-1/+5
| |/ /
* | | Merge topic 'FindRubyOnOpenBSD'David Cole2011-10-181-5/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | d2b1ce6 Find Ruby on OpenBSD when installed from ports (#12507) ba5a8bc Remove trailing whitespace
| * | | Find Ruby on OpenBSD when installed from ports (#12507)Alex Neundorf2011-10-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The ruby library on OpenBSD is named rubyXY, not ruby X.y. Find that too. Alex
| * | | Remove trailing whitespaceAlex Neundorf2011-10-121-4/+4
| |/ / | | | | | | | | | Alex
* | | Merge topic 'DetectMasmCompilerId'David Cole2011-10-181-0/+4
|\ \ \ | |/ / |/| | | | | | | | cf93d63 fix #12465: detect the masm compiler ID ("MSVC")
| * | fix #12465: detect the masm compiler ID ("MSVC")Alex Neundorf2011-10-061-0/+4
| |/ | | | | | | Alex