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
This commit is contained in:
click
2010-09-08 19:20:38 +02:00
parent f1159c2e99
commit 3b91ce95a6
5 changed files with 8 additions and 24 deletions
+3 -3
View File
@@ -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)