From 3b91ce95a64d5ed95b8a5ff3cd595c088df1eb75 Mon Sep 17 00:00:00 2001 From: click Date: Wed, 8 Sep 2010 19:20:38 +0200 Subject: BuildSystem: Sort out issues with mysql-libraries under *nix (and should now also work properly for Win32) - Rename the "EXTERNAL_MYSQL" flag to "USE_MYSQL_SOURCES" to reflect it's PROPER use (and ensure that it's ONLY used on Win32) - Remove a lingering "scripts" definition (the "scripts"-target is always included, but only from compiled parts (broke builds with -DSCRIPTS=0) --HG-- branch : trunk --- cmake/platform/settings.unix.cmake | 9 --------- 1 file changed, 9 deletions(-) (limited to 'cmake/platform/settings.unix.cmake') 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" -- cgit v1.2.3