summaryrefslogtreecommitdiff
path: root/storage/connect
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2014-06-17 10:59:40 +0200
committerSergei Golubchik <serg@mariadb.org>2014-06-23 17:39:13 +0200
commitda9bb66b028da9ef716de7325a5a91fa6216c217 (patch)
treef1c5ed4e5f56ca016ea688909466b7f0d0b5282e /storage/connect
parent242e7f958d7a174d29b06c1c0893c14448111645 (diff)
downloadmariadb-git-da9bb66b028da9ef716de7325a5a91fa6216c217.tar.gz
cmake GUI cleanup
mark path-related variables (AIO_LIBRARY, ODBC_LIBRARY, ODBC_INCLUDE_DIR, Thrift_LIBS, Thrift_INCLUDE_DIRS, CRYPTO_LIBRARY, OPENSSL_LIBRARIES, OPENSSL_ROOT_DIR, OPENSSL_INCLUDE_DIR) as advanced - paths are automatically discovered by cmake. mark few choice variables (ENABLED_LOCAL_INFILE, WITHOUT_SERVER, DISABLE_SHARED) as not advanced - they are user choices, not automatically configured values. remove unused BACKUP_TEST variable.
Diffstat (limited to 'storage/connect')
-rw-r--r--storage/connect/CMakeLists.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/storage/connect/CMakeLists.txt b/storage/connect/CMakeLists.txt
index f8db000a486..41956e5f398 100644
--- a/storage/connect/CMakeLists.txt
+++ b/storage/connect/CMakeLists.txt
@@ -232,6 +232,8 @@ IF(CONNECT_WITH_ODBC)
DOC "Specify the ODBC driver manager library here."
)
+ mark_as_advanced(ODBC_LIBRARY ODBC_INCLUDE_DIR)
+
IF(ODBC_INCLUDE_DIR AND ODBC_LIBRARY)
set(CMAKE_REQUIRED_LIBRARIES ${ODBC_LIBRARY})
set(CMAKE_REQUIRED_INCLUDES ${ODBC_INCLUDE_DIR})