summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| * | | FindALSA: Fix incorrect include path detectionPhilip Lowman2012-02-111-4/+5
| |/ / | | | | | | | | | | | | This fixes a bug where the alsa include path was being detected incorrectly (e.g. /usr/local/include/alsa instead of /usr/local/include)
* | | Merge topic 'sdl-fphsa'David Cole2012-02-146-26/+18
|\ \ \ | | | | | | | | | | | | | | | | a6de8a5 FindSDL*: use FPHSA (#12467)
| * | | FindSDL*: use FPHSA (#12467)Rolf Eike Beer2012-02-116-26/+18
| |/ /
* | | Merge topic 'cmake_add_fortran_subdirectory'David Cole2012-02-143-0/+217
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1e16406 CMakeAddFortranSubdirectory: Add NO_EXTERNAL_INSTALL option 6f6891b CMakeAddFortranSubdirectory: Always parse arguments 48a09f8 CMakeAddFortranSubdirectory: Make IMPORTED targets GLOBAL 067c1f4 VSGNUFortran: Disable test in special cases bd69e1c VSGNUFortran: Add special case for SunPro Fortran runtime library 414a780 CMakeAddFortranSubdirectory: Validate gfortran architecture 7e0d9f1 CMakeAddFortranSubdirectory: Find gfortran in PATH d6b0312 CMakeAddFortranSubdirectory: Fix documentation format and typos e4ae038 CMakeAddFortranSubdirectory: Allow full paths to directories 538c345 Add CMakeAddFortranSubdirectory to use MinGW gfortran in VS 3c6af5f Merge branch 'add-CheckLanguage-module' into CMakeAddFortranSubdirectory
| * | | CMakeAddFortranSubdirectory: Add NO_EXTERNAL_INSTALL optionBrad King2012-02-091-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We do not yet support "make install" in the external project case. Document this explicitly in the interface. Require the caller to use an option to "disable" the unsupported behavior. This will allow us to add the behavior by default in the future without clobbering existing projects that handle the installation themselves.
| * | | CMakeAddFortranSubdirectory: Always parse argumentsBrad King2012-02-091-4/+5
| | | | | | | | | | | | | | | | Parse arguments even in add_subdirectory() mode to validate them.
| * | | CMakeAddFortranSubdirectory: Make IMPORTED targets GLOBALBill Hoffman2012-02-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | cmake_add_fortran_directory uses imported targets when using the mingw fortran compiler. This change makes those targets global in scope so they act just like the real targets that exist when a fortran compiler exists and regular add_subdirectory is used.
| * | | CMakeAddFortranSubdirectory: Validate gfortran architectureBrad King2012-02-091-5/+21
| | | | | | | | | | | | | | | | | | | | | | | | Verify that MINGW_GFORTRAN not only points to a MinGW gfortran but also one that compiles for the target architecture. This prevents using a 32-bit gfortran in a 64-bit MSVC build.
| * | | CMakeAddFortranSubdirectory: Find gfortran in PATHBrad King2012-02-091-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | In the find_program(MINGW_GFORTRAN) call use the PATHS option for hard-coded guesses instead of HINTS. This allows the user environment to override the guesses and corrects usage of the command options.
| * | | CMakeAddFortranSubdirectory: Fix documentation format and typosBrad King2012-02-091-14/+12
| | | | | | | | | | | | | | | | | | | | Indent the function signature correctly. Fix some typos. Fix the copyright year.
| * | | CMakeAddFortranSubdirectory: Allow full paths to directoriesBrad King2012-02-092-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the implementation to allow full paths with spaces. Change the interpretation of relative paths to be with respect to the current binary directory. This matches the convention used in ExternalProject. Test both full and relative paths in the VSGNUFortran test.
| * | | Add CMakeAddFortranSubdirectory to use MinGW gfortran in VSBill Hoffman2012-02-093-0/+177
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds a new module that allows for easy integration of MinGW gfortran and the Visual Studio compiler. It is done in a function called cmake_add_fortran_subdirectory. The patch also includes a test for this feature.
* | | | Merge topic 'qt4-translation-includes'David Cole2012-02-141-1/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 7a6d279 FindQt4: Add include directories for lupdate.
| * | | | FindQt4: Add include directories for lupdate.Clinton Stimpson2012-02-091-1/+7
| | |/ / | |/| | | | | | | | | | | | | | Fixes bug #12644. Thanks Bernd Lörwald for partial patch.
* | | | Merge topic 'qt4-warning-clarification'David Cole2012-02-141-2/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | cbdfcc6 FindQt4: clarify warning message about incorrect Qt installation.
| * | | | FindQt4: clarify warning message about incorrect Qt installation.Clinton Stimpson2012-02-091-2/+3
| |/ / / | | | | | | | | | | | | | | | | Fixes bug #12915. Thanks Laurent Rineau and Brad King for input.
* | | | Merge topic 'PGI-recognise-pgfortran'David Cole2012-02-141-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | bb5f48f detect "pgfortran" as PGI Fortran compiler (#12425)
| * | | | detect "pgfortran" as PGI Fortran compiler (#12425)Rolf Eike Beer2012-02-081-4/+4
| |/ / / | | | | | | | | | | | | See http://www.pgroup.com/doc/pgiug.pdf, page xviii.
* | | | Merge topic 'findx11-xmu'David Cole2012-02-141-0/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | c008141 FindX11: also search for Xmu (#12447)