summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Dynamically add documentation section specified in documented script.Eric NOULARD2012-02-182-2/+2
| | | | Modify CPackDeb and CPackRPM as an example
* 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)
| * | | FindX11: also search for Xmu (#12447)Rolf Eike Beer2012-02-081-0/+10
| |/ /
* | | Merge topic 'add-CheckLanguage-module'David Cole2012-02-141-0/+65
|\ \ \ | | |/ | |/| | | | | | | 5db99e8 Add CheckLanguage module
| * | Add CheckLanguage moduleBrad King2012-02-081-0/+65
| |/ | | | | | | | | | | Define a "check_language(<lang>)" macro to test whether <lang> can be enabled. Cache the result in CMAKE_<lang>_COMPILER. Add a test case covering expected results.
* | Merge topic 'ImproveCPackDoc-reloaded'David Cole2012-02-144-44/+204
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d4b77eb Avoid discovering system infos for documentation. Adding some path is enough. 9002f73 Fix non existent std::string::clear on VS6 02ccb32 Create getDocumentedModulesListInDir which may be used in other context. 24fbc28 Add missing section markup for CPackComponent bafd8a9 Example of builtin variable documentation (i.e. only used in C++ source code). 543f1ad Make the load of script documentation more efficient and dynamic. cdbd1a9 Fix another compiler warning due to a typo 52c53de Really avoid compiler warning about unused vars 37f90ed Calm down compiler warning about unused var 7c82b7f Fix potential bad memory access, thanks to Eike 62b589b Suppress unused var, beautify code, avoid 1 extra newline. 751713f Update bash completion file in order to handle new CPack doc options. 1629615 CPack Documentation extraction from CMake script begins to work 83e34dd Implement simple CMake script comment markup language. c6a0169 CPack begin the implementation of --help-command* and --help-variables*
| * Add missing section markup for CPackComponentEric NOULARD2012-02-141-0/+4
| |
| * Make the load of script documentation more efficient and dynamic.Eric NOULARD2012-02-143-10/+20
| | | | | | | | | | | | | | | | CPack help will be searched in any CPack*.cmake file located near to CPack.cmake file. The script files is parsed iff the first line begin with ##section. Moreover the documentation section name is specified on the remaining part of the line minus the space immediately following ##section.
| * CPack Documentation extraction from CMake script begins to workEric NOULARD2012-01-223-35/+161
| | | | | | | | | | | | | | | | | | | | - Enhance extract doc parser. Seems robust now. The legacy module documentation parser works as before ignoring the new markup. - Proof of concept for CPack (generic), CPack RPM and CPack Deb generator for macro and variables. Try cpack --help-command and cpack --help-variables
| * Implement simple CMake script comment markup language.Eric NOULARD2012-01-222-0/+20
| | | | | | | | | | | | | | | | | | The language is very simple. It use ##<keyword> special comment which opens a structured documentation block and ##end closes it. This may be used to extract documentation for macro as 'command' and 'variables' such that cpack --help-command and --help-variable does parse builtin modules files (CPack.cmake, CPackComponent.cmake, ...) in order to extract the corresponding doc.
* | Merge topic 'lang-enable-order-issue-12929'David Cole2012-02-072-6/+16
|\ \ | | | | | | | | | | | | 7495845 Fix CXX/Fortran MODULE flags when enabled before C (#12929)
| * | Fix CXX/Fortran MODULE flags when enabled before C (#12929)Brad King2012-02-032-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If CXX or Fortran is enabled before C then the values of CMAKE_SHARED_MODULE_C_FLAGS CMAKE_SHARED_MODULE_CREATE_C_FLAGS may not be available. On platforms where MODULE library (plugin) creation is the same as SHARED library creation initialize the MODULE creation flags from the SHARED creation flags of the matching language instead of assuming that C has been enabled first. Teach the COnly and CxxOnly tests to build MODULE libraries. The latter covers this specific case.
* | | Merge topic 'improve-libarchive'David Cole2012-02-071-2/+3
|\ \ \ | | | | | | | | | | | | | | | | 9e25b12 FindLibArchive: support version selection
| * | | FindLibArchive: support version selectionRolf Eike Beer2012-02-011-2/+3
| |/ /
* | | Merge topic 'perl-version'David Cole2012-02-072-27/+48
|\ \ \ | | | | | | | | | | | | | | | | 31826b5 FindPerl{,Libs}: move version detection into FindPerl
| * | | FindPerl{,Libs}: move version detection into FindPerlRolf Eike Beer2012-02-012-27/+48
| | |/ | |/| | | | | | | | | | If the first attempt of getting the version doesn't succeed, try a second approach.
* | | Merge topic 'check_include_files_output'David Cole2012-02-071-5/+5
|\ \ \ | | | | | | | | | | | | | | | | 44d007b CheckIncludeFiles: fix status output
| * | | CheckIncludeFiles: fix status outputRolf Eike Beer2012-02-011-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CHECK_INCLUDE_FILES("foo.h" HAVE_FOO_H) gave an output like: Looking for include files HAVE_FOO_H After this change it does now what CHECK_INCLUDE_FILE() also does: Looking for include files foo.h
* | | | Merge topic 'nsis-user-perm-issue-12923'David Cole2012-02-071-2/+2
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | c4a0bce CPack: Fix NSIS handling of privileged users (#12923)
| * | | CPack: Fix NSIS handling of privileged users (#12923)Mattias Helsing2012-02-011-2/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using the NSIS generator from CPack the file NSIS.template.in is used to generate a project.nsi file for NSIS to process. The file consists code in the NSIS scripting language. Among other functions there is an onInit function the initializes the installer. The function (tries to) recognise admin and power users but fails since NSIS scripting language relative includes the jump from the current command so +3 means "run the third command after this one", so a failed check for admin completely skips the check for a power user and goes directly to "done:". User permission lookup was added in initial NSIS support by commit a11b9a4c (Merge from CPack branch, 2006-01-01). Later commit b1b052fd (Several changes to for NSIS, 2006-03-01) added a line inside a block that should be skipped by a jump without updating the jump length. Update the jump length to correct the behavior.
* | | Merge topic 'improve-findgettext'David Cole2012-02-011-1/+15
|\ \ \ | | | | | | | | | | | | | | | | 77e6c6f FindGettext: support version selection
| * | | FindGettext: support version selectionRolf Eike Beer2012-01-251-1/+15
| |/ /
* | | Merge topic 'Findosg_qt_and_presentation'David Cole2012-02-012-0/+104
|\ \ \ | | | | | | | | | | | | | | | | c040054 Findosg: New modules for osgQt and osgPresentation
| * | | Findosg: New modules for osgQt and osgPresentationPhilip Lowman2012-01-282-0/+104
| |/ / | | | | | | | | | | | | Added new find modules for osgQt and osgPresentation submitted by Robert Osfield <robert.osfield@gmail.com>