kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
28,312 Commits 1 Branch 14 Tags 53 MiB
Commit Graph

28312 Commits

Author SHA1 Message Date
Stephen Kelly ce167b546d cmMakefile: Handle CMP0014 before configuring the generator. 2015-05-14 21:26:13 +02:00
Stephen Kelly 7baef75649 cmLocalGenerator: Assert that there is a parent. 
If the CMakeLists.txt file does not exist, there must be a parent.
The case for the top-level of the project is already handled in
cmake::DoPreConfigureChecks.
 2015-05-14 21:04:17 +02:00
Stephen Kelly 63255342c6 cmMakefile: Remove redundant variable set. 
The variable is initialized by the constructor already.
 2015-05-14 20:57:24 +02:00
Stephen Kelly 894961af16 cmMakefile: Use the state to determine the parent directory. 
Do not depend on the local generator for that.
 2015-05-14 20:57:21 +02:00
Stephen Kelly 115e919982 Use new top-level check abstraction. 2015-05-14 20:47:36 +02:00
Stephen Kelly c5059c9000 cmLocalGenerator: Add abstraction to check if top-level. 
Move from the cmLocalNinjaGenerator.  Fix the case of the name.
 2015-05-14 20:44:55 +02:00
Stephen Kelly b17686d2bb cmGlobalGenerator: Move some flags from cmLocalGenerator. 
These flags are global, and so they belong here instead of being
set on each local generator.
 2015-05-14 20:36:28 +02:00
Stephen Kelly ed41a8e7b4 cmLocalGenerator: Port loops to cmState::Snapshot. 
Make this code less dependent on being part of cmLocalGenerator,
where it doesn't really belong.
 2015-05-14 20:36:28 +02:00
Stephen Kelly 48a9e91b02 cmState: Add an accessor for Parent snapshot and a validity check. 2015-05-14 20:36:28 +02:00
Stephen Kelly e7f7c2e208 cmLocalGenerator: Convert two recursive methods to loops. 2015-05-14 20:36:28 +02:00
Stephen Kelly c5cb3a734d cmLocalGenerator: Get project directories from the cmState. 
Make this class and cmMakefile less interdependent.
 2015-05-14 20:36:28 +02:00
Stephen Kelly 76b598319f cmLocalGenerator: Initialize state before creating cmMakefile. 
Access the state from the local generator in the cmMakefile.
 2015-05-14 20:36:28 +02:00
Stephen Kelly 34c9ee2ed7 cmLocalGenerator: Require a global generator in the constructor. 
Port generator factory methods to pass it.
 2015-05-14 20:36:27 +02:00
Brad King 3837c48334 Tests: Add case for 'ctest' run with bad CTestTestfile 2015-05-14 20:36:27 +02:00
Brad King b317b38d33 cmGlobalBorlandMakefileGenerator: Do not inherit from NMake generator 
The Borland generator re-implements every method the NMake generator
does, so there is no reason to inherit this way.  Instead inherit
directly from cmGlobalUnixMakefileGenerator3 like all the other
makefile generators do.
 2015-05-14 20:30:55 +02:00
Stephen Kelly 9486769866 Don't use a cmLocalGenerator instance to call static methods. 2015-05-14 20:30:09 +02:00
Stephen Kelly a3139d4b15 cmLocalGenerator: Remove EscapeForShellOldStyle to only caller. 2015-05-14 20:30:09 +02:00
Stephen Kelly 443f041c2f cmLocalGenerator: Remove unused members. 2015-05-14 20:30:09 +02:00
Stephen Kelly 501c237a83 install: Use an intermediate filesVector variable. 
Reduce noise.
 2015-05-14 18:23:43 +02:00
Brad King 36c275d857 Merge topic 'update-kwsys' 
576ef8c5 KWSys: Tell Git not to export .gitattributes
c9709dff Merge branch 'upstream-kwsys' into update-kwsys
3b815ed2 KWSys 2015-05-12 (b1d560a0)
 2015-05-14 10:27:44 -04:00
Brad King a86ddbe56e Merge topic 'FindHDF5-version-support' 
56858178 FindHDF5: Add version support
4bd122ad FindHDF5: Check for a few H5pubconf*.h name variants
 2015-05-14 10:27:42 -04:00
Brad King eb9323eb1a Merge topic 'FindJava-openjdk-8' 
7953867b FindJava: Fix OpenJDK 8 version detection (#15565)
 2015-05-14 10:27:40 -04:00
Brad King d430cb7c36 Tests: Fix failures when running under the default install prefix (#15566) 
Fix test cases whose behavior differs when their source or build tree is
under CMAKE_INSTALL_PREFIX by setting an install prefix under the build
tree.  Otherwise they may fail when run under the default install prefix
(e.g. /usr/local).
 2015-05-14 10:07:37 -04:00
Brad King 332ee3e305 Tests: Fix CheckSourceTree test when build is under source (#15566) 
Since the build tree will populate content under the source tree
the test cannot reliably check that the source tree is pristine.
Simply skip most of the test in this case.
 2015-05-14 09:50:34 -04:00
Felix Geyer 12b85b1791 FindSquish: Avoid bash-specific behavior in test script (#15568) 
Fix Squish4RunTestCase.sh to be POSIX compliant by exiting with 255
explicitly instead of depending on bash to translate -1 to 255.  This
script is used by the SQUISH_V3_ADD_TEST and SQUISH_V4_ADD_TEST macros
provided by FindSquish.
 2015-05-14 08:53:33 -04:00
Kitware Robot ee58e94d62 CMake Nightly Date Stamp 2015-05-14 00:01:05 -04:00
Brad King 576ef8c56e KWSys: Tell Git not to export .gitattributes 
KWSys upstream added an attribute to export .gitattributes so that
importing snapshots into the sources of other projects would bring along
the attributes.  However, we don't want to export them from CMake.
Drop .gitattributes entries not relevant to CMake.
 2015-05-13 12:54:49 -04:00
Axel Huebl 5685817874 FindHDF5: Add version support 
Detect the HDF5 version and set HDF5_VERSION just as we
detect HDF5_IS_PARALLEL from the header already.
 2015-05-13 10:00:55 -04:00
Brad King 4bd122ad9c FindHDF5: Check for a few H5pubconf*.h name variants 
Some distros package H5pubconf.h as "H5pubconf-32.h" or "H5pubconf-64.h"
depending on the architecture.  Look for all of these names.
 2015-05-13 09:59:43 -04:00
Brad King c9709dffb0 Merge branch 'upstream-kwsys' into update-kwsys 2015-05-13 08:29:21 -04:00
KWSys Robot 3b815ed283 KWSys 2015-05-12 (b1d560a0) 
Extract upstream KWSys using the following shell commands.

$ git archive --prefix=upstream-kwsys/ b1d560a0 | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' 34fceb50..b1d560a0
Brad King (1):
      b1d560a0 CPU: MIPS is biendian
 2015-05-13 08:28:08 -04:00
Kitware Robot a6a9710fca CMake Nightly Date Stamp 2015-05-13 00:01:06 -04:00
Felix Geyer 7953867ba4 FindJava: Fix OpenJDK 8 version detection (#15565) 
The openjdk-8 (8u45-b14-2) package on Debian unstable has extra
text after the version number components.  Match this and add it
to the reported version string.
 2015-05-12 13:46:12 -04:00
Brad King 53bb51fc31 Merge topic 'ctest-no-make-i' 
226df303 CTest: Stop telling 'make' to ignore errors with -i
28e7a135 Help: Fix build_command alternative signature docs
231601b6 build_command: Choose configuration consistently across signatures
 2015-05-12 09:12:56 -04:00
Brad King 70d48e1287 Merge topic 'cpack-deb-component-dependencies' 
1237d5fa Help: Add notes for topic 'cpack-deb-component-dependencies'
e3f522f6 CPack/DEB per component dependencies
 2015-05-12 09:12:54 -04:00
Brad King a5bab6e1a4 Merge topic 'cpack-not-running-tests' 
7c103be8 CPack: Enable DEB and RPM tests more reliably
 2015-05-12 09:12:52 -04:00
Brad King ffd5d09225 Merge topic 'find_package-no-cmake-gui-paths' 
1506f9ca find_package: Drop search in recent cmake-gui locations
8d484463 FindFLTK: Drop search in recent cmake-gui locations
 2015-05-12 09:12:50 -04:00
Brad King 16d84111da Merge topic 'detect-c++14-missing-gets' 
3307e10f Avoid using C++14 to build CMake if cstdio breaks
 2015-05-12 09:12:48 -04:00
Brad King 733ca510a6 Merge topic 'doc-file-COPY-preserves-structure' 
f39d26ca Help: Clarify file(COPY) directory semantics (#15561)
 2015-05-12 09:12:46 -04:00
Brad King 55fe56444f Merge topic 'ExternalProject-improve-missing-source-error' 
dcb18836 ExternalProject: Improve error when SOURCE_DIR is missing (#15560)
 2015-05-12 09:12:43 -04:00
Brad King cca3bbde98 Merge topic 'ninja-gcc-windows' 
cf8ce7a3 RC: Do not override MinGW Makefiles generator preference
ca658a45 Ninja: Use forward slashes for linking with any GCC on Windows (#15439)
 2015-05-12 09:12:41 -04:00
Brad King 0f2658f62d Merge topic 'suppress-LNK4089-warning' 
a1904934 CTestCustom: Suppress LNK4089 warning about RPCRT4
e228d66d CTestCustom: Suppress LNK4089 warning about ole32
 2015-05-12 09:12:40 -04:00
Brad King 226df303f9 CTest: Stop telling 'make' to ignore errors with -i 
Add policy CMP0061 to maintain compatibility for existing projects.
 2015-05-12 09:06:49 -04:00
Brad King 28e7a135e0 Help: Fix build_command alternative signature docs 
Do not specify that --config will not be added, because the
command does add it.
 2015-05-12 09:06:49 -04:00
Brad King 231601b696 build_command: Choose configuration consistently across signatures 
Teach the legacy two-argument signature to use CMAKE_CONFIG_TYPE
from the environment only if it is non-empty.  This makes behavior
consistent with the main signature.
 2015-05-12 09:06:48 -04:00
Brad King 1237d5fa8c Help: Add notes for topic 'cpack-deb-component-dependencies' 2015-05-12 09:05:17 -04:00
Domen Vrankar 7c103be8de CPack: Enable DEB and RPM tests more reliably 
CPack DEB and RPM generators were not used for some tests because
CPACK_BINARY_DEB and CPACK_BINARY_RPM variable were not set.  Fix this,
simplify generator selection in CTEST_RUN_CPackComponentsForAll, and fix
bugs that were detected after tests were run.
 2015-05-12 08:56:34 -04:00
Kitware Robot df95367d7e CMake Nightly Date Stamp 2015-05-12 00:01:04 -04:00
Brad King cf8ce7a39e RC: Do not override MinGW Makefiles generator preference 
Update logic added in commit 957c2aac (RC: Simplify selection of
resource compiler based on C/C++ toolchain, 2015-05-07) to avoid
overriding CMAKE_GENERATOR_RC.  The MinGW and MSYS Makefiles
generators use it to select a windres next to the compiler even
if it is not in the PATH.
 2015-05-11 09:00:25 -04:00
Kitware Robot df0aa37a67 CMake Nightly Date Stamp 2015-05-11 00:01:05 -04:00