diff options
Diffstat (limited to 'cmake/platform')
| -rw-r--r-- | cmake/platform/settings.unix.cmake | 9 | ||||
| -rw-r--r-- | cmake/platform/settings.win32.cmake | 6 |
2 files changed, 3 insertions, 12 deletions
diff --git a/cmake/platform/settings.unix.cmake b/cmake/platform/settings.unix.cmake index 11d796771c2..9dae9f5ca9f 100644 --- a/cmake/platform/settings.unix.cmake +++ b/cmake/platform/settings.unix.cmake @@ -10,15 +10,6 @@ if( NOT LIBSDIR ) message(STATUS "UNIX: Using default library directory") endif() -# use internal MySQL headers if external is not forced -if( NOT EXTERNAL_MYSQL ) - set(MYSQL_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/dep/mysqllite/include) - set(MYSQL_LIBRARY "libmysql") - set( MYSQL_FOUND 1 ) - message(STATUS "Using internal MySQL.") -endif() - - # configure uninstaller configure_file( "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" diff --git a/cmake/platform/settings.win32.cmake b/cmake/platform/settings.win32.cmake index babb3f1e269..b66eb2da7bb 100644 --- a/cmake/platform/settings.win32.cmake +++ b/cmake/platform/settings.win32.cmake @@ -1,5 +1,5 @@ # Platform-specfic options -option(EXTERNAL_MYSQL "Use your own installed MySQL instead of the internal one" 0) +option(USE_MYSQL_SOURCES "Use included MySQL-sources to build libraries" 1) # Package overloads set(ACE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/dep/acelite) @@ -7,11 +7,11 @@ set(ACE_LIBRARY "ace") set(BZIP2_LIBRARIES "bzip2") set(ZLIB_LIBRARIES "zlib") -if( NOT EXTERNAL_MYSQL ) +if( USE_MYSQL_SOURCES ) set(MYSQL_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/dep/mysqllite/include) set(MYSQL_LIBRARY "libmysql") set( MYSQL_FOUND 1 ) - message(STATUS "Using internal MySQL.") + message(STATUS "Using supplied MySQL sources") endif() # check the CMake preload parameters (commented out by default) |