summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-04-08 21:58:18 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-04-08 22:00:07 +0300
commitedd1a53a55b940bea66f38dd9f05229879e69736 (patch)
tree3e3cd971a1d1c275cc4cbd97efa1a971f8468e6e /cmake
parent1e7ad5bb1c69dba8c7d721a2cfbbe98c7e900015 (diff)
parent937ec3c48d2068dfb76d47cb409eb19d38677da1 (diff)
downloadmariadb-git-edd1a53a55b940bea66f38dd9f05229879e69736.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'cmake')
-rw-r--r--cmake/build_depends.cmake5
1 files changed, 5 insertions, 0 deletions
diff --git a/cmake/build_depends.cmake b/cmake/build_depends.cmake
index 0d17c22cf98..333df580200 100644
--- a/cmake/build_depends.cmake
+++ b/cmake/build_depends.cmake
@@ -16,6 +16,11 @@ IF(RPM)
ENDIF()
ENDMACRO()
+ # FindBoost.cmake doesn't leave any trace, do it here
+ IF (Boost_INCLUDE_DIR)
+ FIND_FILE(Boost_config_hpp boost/config.hpp PATHS ${Boost_INCLUDE_DIR})
+ ENDIF()
+
GET_CMAKE_PROPERTY(ALL_VARS CACHE_VARIABLES)
FOREACH (V ${ALL_VARS})
GET_PROPERTY(H CACHE ${V} PROPERTY HELPSTRING)