summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'locale-agnostic-findhg'Brad King2015-03-021-0/+10
|\ | | | | | | | | cfb22354 FindHg: Run hg with C locale when querying its version.
| * FindHg: Run hg with C locale when querying its version.Nils Gladitz2015-02-281-0/+10
| | | | | | | | | | LANGUAGE should be ignored when LC_ALL=C. It seems this isn't the case with hg so set both.
* | Merge topic 'modules-check-ARGC'Brad King2015-03-028-39/+121
|\ \ | |/ |/| | | | | a7631fc4 Modules: Check for ARGC before using ARGV#
| * Modules: Check for ARGC before using ARGV#Daniele E. Domenichelli2015-02-278-39/+121
| | | | | | | | ARGV# could be defined from a parent scope.
* | Merge branch 'cpack_rpm_mulit_prefix_fixup' into ↵Domen Vrankar2015-02-271-17/+25
|\ \ | | | | | | | | | | | | | | | | | | cpack_rpm_mulit_prefix_fixup-for-master Resolve conflict in Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake by combining the changes from both sides.
| * | CPackRPM: Fix handling of relocation prefix parent directoriesDomen Vrankar2015-02-271-17/+25
| | | | | | | | | | | | | | | | | | | | | In commit 3ec02547 (CPackRPM: Allow multiple path relocation prefixes for one package, 2015-01-21) a regression was introduced that causes parent directories of relocation paths to be incorrectly included in the rpm. Fix this and make the test case more strict to cover it.
* | | Merge topic 'windows-rc-enable-later'Brad King2015-02-264-9/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 772eae44 RC: Add platform-specific preprocessor definitions (#15404) 4300de3e RC: Enable language after C, CXX, or Fortran is enabled (#15404) 1de4a0fb RC: Drop unused CMAKE_COMPILE_RESOURCE variable setting
| * | | RC: Add platform-specific preprocessor definitions (#15404)Brad King2015-02-251-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Platform/Windows-MSVC the C and CXX flags are initialized to contain preprocessor definitions describing the platform. On WinCE platforms this may not be just -DWIN32. This information may be important to RC sources too, so add such preprocessor definitions to the default RC flags. Suggested-by: Gunnar Roth <gunnar.roth@gmx.de>
| * | | RC: Enable language after C, CXX, or Fortran is enabled (#15404)Brad King2015-02-253-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The RC language is special in that it is automatically enabled on Windows-based platforms when another primary language is enabled. Move enablement of RC from early in the enablement of the other language to late. This will allow it to use information detected as part of enabling C, CXX, or Fortran.
| * | | RC: Drop unused CMAKE_COMPILE_RESOURCE variable settingBrad King2015-02-252-3/+0
| | | | | | | | | | | | | | | | | | | | This variable has long been replaced by CMAKE_RC_COMPILE_OBJECT. Stop setting it in platform modules.
* | | | Merge topic 'ExternalData-url-algo-map'Brad King2015-02-261-1/+40
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | f7f4ca55 ExternalData: Add support for custom algorithm-to-URL mapping
| * | | ExternalData: Add support for custom algorithm-to-URL mappingBrad King2015-02-251-1/+40
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Allow URL templates to contain a %(algo:<key>) placeholder that is replaced by mapping the canonical hash algorithm name through a map defined by the <key>. Extend the Module.ExternalData test to cover the behavior. Extend the RunCMake.ExternalData test to cover error cases.
* | | Merge topic 'CheckCompilerFlag-use-FLAGS'Brad King2015-02-253-12/+12
|\ \ \ | | | | | | | | | | | | | | | | 5d5067ae Check*CompilerFlag: Refactor method used to pass flags
| * | | Check*CompilerFlag: Refactor method used to pass flagsMark Abraham2015-02-243-12/+12
| |/ / | | | | | | | | | | | | | | | | | | Refactor the Check*CompilerFlag modules to pass the flags to Check*SourceCompiles using CMAKE_REQUIRED_FLAGS instead of CMAKE_REQUIRED_DEFINITIONS. Both end up being used, but the variable for "FLAGS" is more precise.
* | | Merge topic 'refine-MSVC-ARM-WinCE'Brad King2015-02-253-14/+48
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 3d612c73 MSVC: Compile with arch-specific flags on ARM platforms (#14552) 886dcaa7 MSVC: Distinguish among ARM architectures more precisely (#14552) ea986676 MSVC: Define /DWINCE when building for WinCE platforms (#14552)
| * | MSVC: Compile with arch-specific flags on ARM platforms (#14552)Gunnar Roth2015-02-241-0/+11
| | | | | | | | | | | | | | | Define the exact ARM architecture name as a preprocessor symbol. Compile with /QRarch4T or /QRarch5T on ARMV4I or ARMV5I.
| * | MSVC: Distinguish among ARM architectures more precisely (#14552)Gunnar Roth2015-02-243-13/+36
| | | | | | | | | | | | | | | Detect the exact ARM architecture instead of just "ARM". Treat "ARM" as an architecture family that includes THUMB (ARMV4I and ARMV5I).
| * | MSVC: Define /DWINCE when building for WinCE platforms (#14552)Gunnar Roth2015-02-241-1/+1
| | |
* | | Merge topic 'FindMatlab-remove-trailing-lines'Brad King2015-02-241-1/+0
|\ \ \ | | | | | | | | | | | | | | | | 08d1e65a FindMatlab: Remove trailing blank lines
| * | | FindMatlab: Remove trailing blank linesBrad King2015-02-241-1/+0
| | | |
* | | | Merge topic 'osx-framework-search-platform-SDKs'Brad King2015-02-241-0/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 0ee2a004 OS X: Add platform-specific Frameworks search path
| * | | | OS X: Add platform-specific Frameworks search pathGregor Jasny2015-02-231-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise find_library is unable to lookup the XCTest framework which is not located in the SDK serach path: In the 10.10 SDK the SDK frameworks are located here: $DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks whereas the Platform SDKs are located here: $DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/Library/Frameworks Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
* | | | | Merge topic 'FeatureSummary-no-duplicates'Brad King2015-02-241-0/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 38ef2b73 FeatureSummary: Print each feature info only once
| * | | | | FeatureSummary: Print each feature info only onceGregor Jasny2015-02-231-0/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a feature is added multiple times via ADD_FEATURE_INFO it should appear only once in FEATURE_SUMMARY. Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
* | | | | Merge topic 'rpm_at_in_path'Brad King2015-02-241-10/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 5857ca5e CPackRPM: Drop explicit handling of '@' symbols that breaks them (#14782)
| * | | | | CPackRPM: Drop explicit handling of '@' symbols that breaks them (#14782)Domen Vrankar2015-02-241-10/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v2.8.12~218^2 (CPackRPM protect '@' character in filename processed in the spec file, 2013-07-05) was not necessary after commit v2.8.12~439^2 (Add support for componentized USER spec file, 2013-04-01). The latter replaced ${VAR} references in the spec file template string with \@VAR\@ references, thus protecting '@' symbols automatically. This caused CPackRPM to break paths with @ symbols. Revert the change to fix the behavior, and add a test case.
* | | | | Merge topic 'GetPrerequisites-file-command-update'Brad King2015-02-241-0/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | fe558718 GetPrerequisites: Update output matching for newer 'file' versions
| * | | | | GetPrerequisites: Update output matching for newer 'file' versionsMarcus Meissner2015-02-231-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Detect PIE binaries with newer 'file' (5.22). It no longer prints "(uses shared libraries)" but does print "interpreter": # file 5.19 $ file /usr/bin/su /usr/bin/su: ... shared object, ..., dynamically linked (uses shared libs), ... # file 5.22 $ file /usr/bin/su /usr/bin/su: ... shared object, ..., dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, ...
| * | | | | Merge branch 'FindCurses-remove-unused-check' into releaseBrad King2015-02-201-2/+0
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'private-FindJsonCpp' into releaseBrad King2015-02-201-117/+0
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge topic 'ctest-output-options'Brad King2015-02-241-5/+20
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ff1ddd2a ctest_upload: Add QUIET option 0b87b2a3 ctest_memcheck: Add QUIET option fc58bdb9 ctest_coverage: Add QUIET option 876a680d ctest_test: Add QUIET option 49ba4545 ctest_build: Add QUIET option f999dc0b ctest_configure: Add QUIET option 645ad117 ctest_update: Add QUIET option 19d1a559 ctest_start: Add QUIET option 1643b905 ctest_submit: Add QUIET option 12db1139 CTest: Add cmCTestOptionalLog macro
| * | | | | | | ctest_coverage: Add QUIET optionZack Galbreath2015-02-231-5/+20
| | | | | | | |
* | | | | | | | Merge topic 'rpm_package_architecture'Brad King2015-02-231-6/+26
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b6f94e6b Help: Add notes for topic 'rpm_package_architecture' f174b919 Tests: CpackRPM test component architecture 3aa9f89d CPackRPM: Support rpm architecture in components 761562fe CPackRPM: Fix CPACK_RPM_PACKAGE_ARCHITECTURE
| * | | | | | | | CPackRPM: Support rpm architecture in componentsJoshua A Clayton2015-02-231-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CPACK_RPM_<component>_PACKAGE_ARCHITECTURE variable allows the same project to support packages of different architectures including noarch, native and foreign architectures.
| * | | | | | | | CPackRPM: Fix CPACK_RPM_PACKAGE_ARCHITECTUREJoshua A Clayton2015-02-231-6/+15
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BuildArch must only be added to a spec file for a "noarch" package or rpmbuild will fail. For all others, the --target argument sets the package architecture. In the process of Fixing rpm architecture, we make it mandatory, adding a default value of native architecture (the same as if no --target argument is present). Update the documentation at the top of the file to make it mandatory.
* | | | | | | | Merge topic 'fix-graphiz-typo'Brad King2015-02-231-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f93438cd Fix typo, graphiz -> graphviz.
| * | | | | | | | Fix typo, graphiz -> graphviz.Stephen Kelly2015-02-211-1/+1
| |/ / / / / / /
* | | | | | | | Merge topic 'CheckStructHasMember-fix-null-deref-warning'Brad King2015-02-231-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e1da4dc2 CheckStructHasMember: fix null deref warning (#15413)
| * | | | | | | | CheckStructHasMember: fix null deref warning (#15413)Peter Wu2015-02-201-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clang Static Analyzer is so smart that it reports a defect when this intended null-deref is encountered. Use sizeof instead which has no runtime effects.
* | | | | | | | Merge topic 'FindCurses-remove-unused-check'Brad King2015-02-231-2/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | b4005a3a FindCurses: Drop unused check for cbreak in tinfo library
| * | | | | | | FindCurses: Drop unused check for cbreak in tinfo libraryBrad King2015-02-201-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This check was first added by commit v3.0.0-rc5~6^2 (FindCurses: Detect and satisfy ncurses dependency on tinfo, 2014-01-17), but it is not correctly conditioned on existence of the tinfo library and fails if the code path is taken but tinfo is not found. However, since commit v3.2.0-rc1~369^2 (FindCurses: Drop search for deprecated HP-UX cur_colr library, 2014-11-17) the result of the check is not used, so simply drop it.
* | | | | | | | Merge topic 'private-FindJsonCpp'Brad King2015-02-231-117/+0
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | / / / | | |_|_|/ / / | |/| | | | | | | | | | | | a41d621d bootstrap: Add --(no-)system-jsoncpp options a5768442 FindJsonCpp: Drop new module due to upstream jsoncpp providing package
| * | | | | | FindJsonCpp: Drop new module due to upstream jsoncpp providing packageBrad King2015-02-201-117/+0
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since jsoncpp 0.7.0 (2014-11-20) the upstream may provide a CMake package configuration file such that find_package(jsoncpp) will find a jsoncppConfig.cmake file. In order to avoid conflicting with this (especially on case-insensitive filesystems), and since we always prefer projects to provide package config files (that they maintain), it is better to not provide FindJsonCpp publicly. Move FindJsonCpp into a private source directory that is not installed so that we can still use it for building CMake itself. Reported-by: Ryan Pavlik <ryan.pavlik@gmail.com>
* | | | | | Merge topic 'CMakeParseImplicitLinkInfo-CMP0054'Brad King2015-02-191-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | d1cf09e3 CMakeParseImplicitLinkInfo: Avoid if() auto-deref in quoted arg
| * | | | | | CMakeParseImplicitLinkInfo: Avoid if() auto-deref in quoted argBrad King2015-02-181-1/+1
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | When matching implicit library names, use a sentinel "x" to avoid ever expanding the library name as a variable. This was detected by a CMP0054 warning.
* | | | | | Merge topic 'mingw-no-find_library-dll'Brad King2015-02-191-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | a0f17fbe Windows-GNU: Do not tell find_library to treat '.dll' as linkable
| * | | | | | Windows-GNU: Do not tell find_library to treat '.dll' as linkableBrad King2015-02-181-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Modern software distributions always use a separate ".dll.a" or ".lib" import library for linking.
* | | | | | Merge topic 'compiler-version-Fortran'Brad King2015-02-193-2/+146
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4cf3589e Help: Add notes for topic 'compiler-version-Fortran' f611406f Fortran: Test that CMAKE_Fortran_COMPILER_VERSION is set (#15372) c6e1f464 Fortran: Detect G95 compiler version 0033faac Fortran: Detect PGI compiler version 302d47b1 Fortran: Detect XL and VisualAge compiler versions 8c8b77a5 Fortran: Detect GNU compiler version 49562a77 Fortran: Detect PathScale compiler version aa77b631 Fortran: Detect SunPro compiler version 2e09c423 Fortran: Detect Intel compiler version e6ebc814 Fortran: Add infrastructure to detect compiler version (#15372)
| * | | | | | Fortran: Detect G95 compiler versionBrad King2015-02-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The __G95__ and __G95_MINOR__ preprocessor symbols encode the compiler version as decimal digits.
| * | | | | | Fortran: Detect PGI compiler versionBrad King2015-02-191-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port logic from the "Compiler/PGI-DetermineCompiler" module into "CMakeFortranCompilerId.F.in".
generated by cgit v0.12 at 2025-01-31 05:38:23 (GMT)