summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* GenerateExportHeader: remove unneeded codeRolf Eike Beer2012-02-241-7/+0
| | | | | These expressions check for command line arguments unsupported by the compiler. We don't pass any custom flags here anyway so this isn't needed.
* Merge topic 'HandleTargetsInCMakeRequiredLibraries'David Cole2012-02-2112-33/+217
|\ | | | | | | | | | | | | | | 35c48e1 Check*.cmake: Expand imported targets in CMAKE_REQUIRED_LIBRARIES 61cb4ea bootstrap: move while() and endwhile() into the bootstrap build c9f2886 -don't pull in CheckTypeSize.cmake from the cmake which is being built 628f365 -remove trailing whitespace
| * Check*.cmake: Expand imported targets in CMAKE_REQUIRED_LIBRARIESAlex Neundorf2012-02-2112-11/+195
| | | | | | | | | | | | | | | | | | | | | | Add the function cmake_expand_imported_targets() to expand imported targets in a list of libraries into their on-disk file names for a particular configuration. Adapt the implementation from KDE's HANDLE_IMPORTED_TARGETS_IN_CMAKE_REQUIRED_LIBRARIES which has been in use for over 2 years. Call the function from all the Check*.cmake macros to handle imported targets named in CMAKE_REQUIRED_LIBRARIES. Alex
| * -remove trailing whitespaceAlex Neundorf2012-02-216-22/+22
| | | | | | | | Alex
* | Merge topic 'qt3-find-qtmain'David Cole2012-02-211-1/+4
|\ \ | | | | | | | | | | | | f506621 Fix paths/hints for finding qtmain.
| * | Fix paths/hints for finding qtmain.Clinton Stimpson2012-02-201-1/+4
| | |
* | | Merge topic 'CPack-dynamicDocSection'David Cole2012-02-218-58/+206
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9a8103e Try to fix compile error on Win32-vs70 4da2223 Fix typo in end markup cfac874 More documentation concerning CPack Components dee0a38 Put CPack DMG and PackageMaker doc in separate files b4abcfe Correct copy/paste section name mistake 9717727 Suppress unecessary (now empty) doc sections 7a8f44a Add structure documentation for CPack Bundle generator b8a274c Add structured documentation for NSIS a6bce55 Dynamically add documentation section specified in documented script.
| * | | Fix typo in end markupEric NOULARD2012-02-181-1/+1
| | | |
| * | | More documentation concerning CPack ComponentsEric NOULARD2012-02-181-1/+46
| | | |
| * | | Put CPack DMG and PackageMaker doc in separate filesEric NOULARD2012-02-183-55/+104
| | | |
| * | | Correct copy/paste section name mistakeEric NOULARD2012-02-181-1/+1
| | | |
| * | | Add structure documentation for CPack Bundle generatorEric NOULARD2012-02-181-0/+12
| | | |
| * | | Add structured documentation for NSISEric NOULARD2012-02-181-0/+42
| | | |
| * | | Dynamically add documentation section specified in documented script.Eric NOULARD2012-02-182-2/+2
| |/ / | | | | | | | | | Modify CPackDeb and CPackRPM as an example
* | | Merge topic 'GenerateExportHeader_MinorFix'David Cole2012-02-211-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 54e1f6f GenerateExportHeader: use double quotes around _gcc_version
| * | | GenerateExportHeader: use double quotes around _gcc_versionAlex Neundorf2012-02-181-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The GenerateExportHeaders test was failing on one machine, the version could not be determined there, so the _gcc_version was empty, so the first argument to if() was empty, so it complained: http://open.cdash.org/testDetails.php?test=135623436&build=2016288 Use double quotes to turn the non-existant first argument into an empty string. Alex
* | | Merge topic 'improve-findopenmp'David Cole2012-02-211-72/+133
|\ \ \ | | | | | | | | | | | | | | | | | | | | 6f573ac FindOpenMP: try the most likely flags first 81228e9 FindOpenMP: do not fail if only C or CXX is enabled (#11910)
| * | | FindOpenMP: try the most likely flags firstRolf Eike Beer2012-02-181-32/+67
| | | | | | | | | | | | | | | | | | | | | | | | Since we know which compiler we have we can test those OpenMP flags first that are likely to be correct. This doesn't make any difference for GNU compilers, but it should avoid useless try_compiles and output cluttering for all others.
| * | | FindOpenMP: do not fail if only C or CXX is enabled (#11910)Rolf Eike Beer2012-02-081-43/+69
| | | | | | | | | | | | | | | | Inspired-By: Raymond Wan
* | | | Merge topic 'improve-findfreetype'David Cole2012-02-211-2/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | f58cce0 FindFreetype: support version selection
| * | | | FindFreetype: support version selectionRolf Eike Beer2012-02-171-2/+26
| | |/ / | |/| |
* | | | Merge topic 'fix-typos-12975'David Cole2012-02-215-7/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 7ec2ebd fix the same typos as found by Debian in other places, too d36d29f various typo and formatting fixes in manual pages (#12975)
| * | | | fix the same typos as found by Debian in other places, tooRolf Eike Beer2012-02-182-2/+2
| | | | |
| * | | | various typo and formatting fixes in manual pages (#12975)Modestas Vainius2012-02-183-5/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch fixes the following lintian warnings: W: cmake-data: manpage-has-errors-from-man usr/share/man/man1/cmakemodules.1.gz 2728: warning: macro `..' not defined I: cmake-data: spelling-error-in-manpage usr/share/man/man1/cmakemodules.1.gz overriden overridden I: cmake-data: spelling-error-in-manpage usr/share/man/man1/cmakemodules.1.gz overriden overridden I: cmake-data: spelling-error-in-manpage usr/share/man/man1/cmakemodules.1.gz explicitely explicitly I: cmake-data: spelling-error-in-manpage usr/share/man/man1/cmakemodules.1.gz jave java W: cmake-data: manpage-has-errors-from-man usr/share/man/man1/cmakeprops.1.gz 1040: warning [p 25, 3.7i]: can't break line W: cmake: manpage-has-errors-from-man usr/share/man/man1/cmake.1.gz 4233: warning [p 85, 1.3i]: can't break line I: cmake: spelling-error-in-manpage usr/share/man/man1/cmake.1.gz overriden overridden I: cmake: spelling-error-in-manpage usr/share/man/man1/cmake.1.gz overriden overridden I: cmake: spelling-error-in-manpage usr/share/man/man1/cmake.1.gz explicitely explicitly I: cmake: spelling-error-in-manpage usr/share/man/man1/cmake.1.gz jave java
* | | | Merge topic 'improve-findpkgconfig'David Cole2012-02-211-5/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 2750115 FindPkgConfig: support version selection of pkg-config itself
| * | | | FindPkgConfig: support version selection of pkg-config itselfRolf Eike Beer2012-02-181-5/+16
| |/ / /
* | | | Merge topic 'improve-findlibxslt'David Cole2012-02-211-3/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 70697a8 FindLibXslt: support version selection
| * | | | FindLibXslt: support version selectionRolf Eike Beer2012-02-171-3/+15
| |/ / /
* | | | Merge topic 'improve-findruby'David Cole2012-02-211-31/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 854e762 FindRuby: clean up querying variables from Ruby
| * | | | FindRuby: clean up querying variables from RubyRolf Eike Beer2012-02-171-31/+26
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Newer Ruby versions (from 1.9 onward) seem to warn if you query Config::CONFIG and print a warning to use RbConfig instead. RbConfig seems to also work in older versions, at least in 1.8. Use a macro to query RbConfig first and only if that doesn't give anything fall back to Config.
* | | | Merge topic 'findblas-bugs'David Cole2012-02-212-141/+154
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 4585e57 FindBLAS/FindLAPACK: Work with MKL version 10.3 (#12924, #12925)
| * | | | FindBLAS/FindLAPACK: Work with MKL version 10.3 (#12924, #12925)Alexey Ozeritsky2012-02-162-141/+154
| | | | |
* | | | | Merge topic 'FindX11_SearchXxf86vm'David Cole2012-02-211-3/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | b295162 fix #6976: FindX11 also searches for X11_Xxf86vm_LIB
| * | | | | fix #6976: FindX11 also searches for X11_Xxf86vm_LIBAlex Neundorf2012-02-161-3/+5
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This contains a change, which changes the behaviour a bit: now X11_xf86vmode_FOUND is only set to TRUE and the include directory is added to X11_INCLUDE_DIR, if additionally to X11_xf86vmode_INCLUDE_PATH also X11_Xxf86vm_LIB has been found. I hope this doesn't cause regressions somewhere. Alex
* | | | | Merge topic 'fix_fortran_dir_two_dirs'David Cole2012-02-211-6/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 087bea3 Allow two cmake_add_fortran_subdirectory calls in the same project.
| * | | | | Allow two cmake_add_fortran_subdirectory calls in the same project.Bill Hoffman2012-02-161-6/+6
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Configure the build_mingw.cmake.in config_mingw.cmake.in files into the binary directory of the directory being built, not the top level binary directory for the project.
* | | | | Merge topic 'improve-findglut'David Cole2012-02-211-18/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 14dadbd FindGLUT: honor REQUIRED (#12466)
| * | | | | FindGLUT: honor REQUIRED (#12466)Rolf Eike Beer2012-02-151-18/+16
| | |_|/ / | |/| | |
* | | | | Merge topic 'findperllibs-windows'David Cole2012-02-211-31/+23
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 10dfec3 FindPerlLibs: properly detect libperl on Windows (#12224)
| * | | | | FindPerlLibs: properly detect libperl on Windows (#12224)Rolf Eike Beer2012-02-141-31/+23
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also cleans up a bunch of things on the way: -when perl was queried for paths they were not converted to CMake style on Windows. -the result when perl was queried for the perl library name was ignored since it was expanded with the possible paths, which is not a valid input for find_library(). If perl returns a library name we now will look only for this name and not for the default names and use the default names only when the executable does not give us a hint. -get rid of 2 variables that were only used at one place and directly put the values in the call to find_library() and find_path(). Inspired by Jeff Trull
* | | | | Merge topic 'FindGetTextFixMultipleTargets'David Cole2012-02-211-5/+43
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | 3b48822 FindGetText: fix multiple targets with the same name problem (CMP0002)
| * | | | FindGetText: fix multiple targets with the same name problem (CMP0002)Alex Neundorf2012-02-121-5/+43
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The functions in FindGettext create a custom target. If the functions are called multiple times, multiple times the same target is created. This works only if CMP0002 is set to OLD. With this patch there is only one central target created, and each invocation of the function creates a target with a unique name and make the central target depend on this one. Alex
* | | | Merge topic 'asn_java_exec'David Cole2012-02-141-17/+37
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 18e8d2f java: Add CMAKE_JAVA_JAR_ENTRY_POINT optional variable. 525bb92 java: Add CMAKE_JAVA_TARGET_OUTPUT_DIR optional variable. 17a8e16 java: Factor jar output path.
| * | | | java: Add CMAKE_JAVA_JAR_ENTRY_POINT optional variable.Nicolas Despres2012-02-131-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Matthieu Carpentier. Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
| * | | | java: Add CMAKE_JAVA_TARGET_OUTPUT_DIR optional variable.Nicolas Despres2012-02-131-9/+18
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
| * | | | java: Factor jar output path.Nicolas Despres2012-02-131-9/+11
| |/ / / | | | | | | | | | | | | Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
* | | | Merge topic 'open64-compiler-flags'David Cole2012-02-142-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 9b4e4c9 Improve checks for Open64 and g++ incompatible flags (#12119)
| * | | | Improve checks for Open64 and g++ incompatible flags (#12119)Matthias Kretz2012-02-122-0/+5
| |/ / /
* | | | Merge topic 'alsa_prefix_include_fix'David Cole2012-02-141-6/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 11cf52e FindALSA: Fix version detection after last commit 815485e FindALSA: Fix incorrect include path detection
| * | | | FindALSA: Fix version detection after last commitPhilip Lowman2012-02-121-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, removed detection of header file from <PREFIX>/include. Can't find any example in alsa source code where the library headers were installed outside of <PREFIX>/include/alsa.
generated by cgit v0.12 at 2025-01-10 02:38:53 (GMT)