diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-08-02 21:26:16 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-08-02 21:26:16 +0200 |
| commit | 1c6ad62a269a3a03d8a343e1412876e04e9e9c37 (patch) | |
| tree | 1e837eb728452ebaf749b5f9eedc018404798ed6 /CMakeLists.txt | |
| parent | 14200dfa43756a0f9cb50c0b5d47d99b4fb1b6fa (diff) | |
| parent | e9b2f5bf15281583b38a56b12f9ae2420c46a6d1 (diff) | |
| download | mariadb-git-1c6ad62a269a3a03d8a343e1412876e04e9e9c37.tar.gz | |
mysql-5.5.39 merge
~40% bugfixed(*) applied
~40$ bugfixed reverted (incorrect or we're not buggy)
~20% bugfixed applied, despite us being not buggy
(*) only changes in the server code, e.g. not cmakefiles
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b03cdf438a3..297cb7709c3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,6 +26,14 @@ IF(POLICY CMP0022) CMAKE_POLICY(SET CMP0022 OLD) ENDIF() +# We use the LOCATION target property (CMP0026) +# and get_target_property() for non-existent targets (CMP0045) +IF(CMAKE_VERSION VERSION_EQUAL "3.0.0" OR + CMAKE_VERSION VERSION_GREATER "3.0.0") + CMAKE_POLICY(SET CMP0026 OLD) + CMAKE_POLICY(SET CMP0045 OLD) +ENDIF() + MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}") SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake) @@ -422,7 +430,6 @@ IF(NOT WITHOUT_SERVER) IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) ADD_SUBDIRECTORY(internal) ENDIF() - ADD_SUBDIRECTORY(packaging/rpm-uln) ADD_SUBDIRECTORY(packaging/rpm-oel) ENDIF() |