diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-25 17:18:15 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-25 17:18:15 +0200 |
commit | 8b480df63ec76963fd96d2e00b911a801b912591 (patch) | |
tree | 4bc43fd486fbbfef4e05977a2080c4e1dbb59da9 /CMakeLists.txt | |
parent | c0ba036b774b8e35567dccce421890d2199f30ce (diff) | |
parent | dbc0d576a3f402ae52423fe424ed0a68f49537ef (diff) | |
download | mariadb-git-8b480df63ec76963fd96d2e00b911a801b912591.tar.gz |
Merge 10.3 into 10.4
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 895fd489a23..de89f6a93b9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,7 +25,8 @@ ENDIF() MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}") -SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake) +SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} + ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_SOURCE_DIR}/cmake/Internal/CPack) # Use a default manufacturer if no manufacturer was identified. IF(NOT DEFINED MANUFACTURER) |