diff options
| author | Shauren <shauren.dev@gmail.com> | 2011-01-10 19:22:46 +0100 |
|---|---|---|
| committer | Shauren <shauren.dev@gmail.com> | 2011-01-10 19:22:46 +0100 |
| commit | b2404c1a26d939e4b13a1d40450b75ad6560e91f (patch) | |
| tree | 1de742fd2dfc1d446cd45cd3ab3f116c77d0cb1b | |
| parent | 5755ab14acd0255654f32d5c40d0cdd07b6c3880 (diff) | |
Buildsystem: Move EnsureVersion macro-loading into genrevision.cmake. Fixes ensure_version macro not being found.
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | cmake/genrev.cmake | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3aa447da0c6..5f1ca3c4b5e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,7 +31,6 @@ endif() include(CheckCXXSourceRuns) include(CheckIncludeFiles) -include(EnsureVersion) # set default buildoptions and print them include(cmake/options.cmake) diff --git a/cmake/genrev.cmake b/cmake/genrev.cmake index f32f6710f41..f628755c1a6 100644 --- a/cmake/genrev.cmake +++ b/cmake/genrev.cmake @@ -8,6 +8,8 @@ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +include(${CMAKE_SOURCE_DIR}/cmake/macros/EnsureVersion.cmake) + set(_REQUIRED_GIT_VERSION "1.7") find_program(_GIT_EXEC |