diff options
| author | Daniel Black <daniel.black@au.ibm.com> | 2016-09-23 09:24:22 +1000 |
|---|---|---|
| committer | Daniel Black <daniel.black@au.ibm.com> | 2016-09-23 09:24:22 +1000 |
| commit | f05dfbebccf415ab5f9f9ee4253478636baf9b34 (patch) | |
| tree | 5f0d2da20d2044cc3beb3454ecf53ccdeecc723f /CMakeLists.txt | |
| parent | 633e995c6299afdd2d20ea7b7a46a5359e6eb552 (diff) | |
| parent | 6304c0bfc7242ad54d93168e97e82022765934e3 (diff) | |
| download | mariadb-git-f05dfbebccf415ab5f9f9ee4253478636baf9b34.tar.gz | |
Merge 10.2
Signed-off-by: Daniel Black <daniel.black@au.ibm.com>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 48742995722..f35136f00f9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,6 +31,9 @@ IF(CMAKE_VERSION VERSION_EQUAL "3.0.0" OR CMAKE_POLICY(SET CMP0045 OLD) CMAKE_POLICY(SET CMP0042 OLD) ENDIF() +IF(POLICY CMP0054) + CMAKE_POLICY(SET CMP0054 NEW) +ENDIF() MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}") @@ -112,6 +115,11 @@ FOREACH(_base ENDIF() ENDFOREACH() +FOREACH(tool gtar tar git) + STRING(TOUPPER ${tool} TOOL) + FIND_PROGRAM(${TOOL}_EXECUTABLE ${tool} DOC "path to the executable") + MARK_AS_ADVANCED(${TOOL}_EXECUTABLE) +ENDFOREACH() # Following autotools tradition, add preprocessor definitions # specified in environment variable CPPFLAGS @@ -364,7 +372,7 @@ ADD_SUBDIRECTORY(strings) ADD_SUBDIRECTORY(vio) ADD_SUBDIRECTORY(mysys) ADD_SUBDIRECTORY(mysys_ssl) -ADD_SUBDIRECTORY(libmysql) +INCLUDE(mariadb_connector_c) # this does ADD_SUBDIRECTORY(libmariadb) ADD_SUBDIRECTORY(client) ADD_SUBDIRECTORY(extra) ADD_SUBDIRECTORY(libservices) |