From 13b769c326f2087c87cdb78ab2fae47ec17e4b18 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Tue, 30 May 2006 09:02:38 +0000 Subject: Move cmake duplicate check here: -> FindTagLib: need by kdemultimedia/amarok -> FindPostgreSQL: need by koffice-kexi/amarok -> FindMySQL: need by koffice-kexi/amarok -> FindMusicBrainz: need by amarok/kdemultimedia -> FindUSB: need by kdebase/amarok -> FindBerkeleyDB: need by kbabel/kdevelop -> FindRUBY: need by koffice-kross/amarok I will remove them from kde module after new snapshot (next monday) svn path=/trunk/KDE/kdelibs/; revision=546487 --- modules/FindMySQL.cmake | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 modules/FindMySQL.cmake (limited to 'modules/FindMySQL.cmake') diff --git a/modules/FindMySQL.cmake b/modules/FindMySQL.cmake new file mode 100644 index 00000000..151251be --- /dev/null +++ b/modules/FindMySQL.cmake @@ -0,0 +1,28 @@ +# - Find MySQL +# Find the MySQL includes and client library +# This module defines +# MYSQL_INCLUDE_DIR, where to find mysql.h +# MYSQL_LIBRARIES, the libraries needed to use MySQL. +# MYSQL_FOUND, If false, do not try to use MySQL. + +find_path(MYSQL_INCLUDE_DIR mysql.h + /usr/include/mysql + /usr/local/include/mysql +) + +find_library(MYSQL_LIBRARIES NAMES mysqlclient + PATHS + /usr/lib/mysql + /usr/local/lib/mysql +) + +if(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES) + set(MYSQL_FOUND TRUE) + message(STATUS "Found MySQL: ${MYSQL_INCLUDE_DIR}, ${MYSQL_LIBRARIES}") +else(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES) + set(MYSQL_FOUND FALSE) + message(STATUS "MySQL not found.") +endif(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES) + +mark_as_advanced(MYSQL_INCLUDE_DIR MYSQL_LIBRARIES) + -- cgit v1.2.1 From c778596920e0d5357f216c885e35b4f97d371a23 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sat, 9 Sep 2006 10:18:35 +0000 Subject: added copyright notice everywhere. Now they all are BSD-licensed, as copyright holder I inserted everywhere the one who added it to svn (or Kitware if it is an enhanced copy from taken cmake) Some developers committed quite often but were not the ones who added the file, if you feel you have also copyright on the file add your name in the specific file. Copyright holders: CCMAIL: montel@kde.org CCMAIL: toscano.pino@tiscali.it CCMAIL: adymo@kdevelop.org CCMAIL: ranger@befunk.com CCMAIL: zack@kde.org CCMAIL: caslav.ilic@gmx.net CCMAIL: syntheticpp@yahoo.com CCMAIL: js@iidea.pl CCMAIL: michael.larouche@kdemail.net CCMAIL: ossi@kde.org CCMAIL: faure@kde.org Committers, but no files added so that they are not listed as copyright holders: CCMAIL: ch.ehrlicher@gmx.de CCMAIL: winter@kde.org CCMAIL: ralf.habacker@freenet.de CCMAIL: moura@kdewebdev.org CCMAIL: kde-buildsystem@kde.org Alex svn path=/trunk/KDE/kdelibs/; revision=582410 --- modules/FindMySQL.cmake | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'modules/FindMySQL.cmake') diff --git a/modules/FindMySQL.cmake b/modules/FindMySQL.cmake index 151251be..426f11ed 100644 --- a/modules/FindMySQL.cmake +++ b/modules/FindMySQL.cmake @@ -4,6 +4,12 @@ # MYSQL_INCLUDE_DIR, where to find mysql.h # MYSQL_LIBRARIES, the libraries needed to use MySQL. # MYSQL_FOUND, If false, do not try to use MySQL. +# +# Copyright (c) 2006, Jaroslaw Staniek, +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + find_path(MYSQL_INCLUDE_DIR mysql.h /usr/include/mysql -- cgit v1.2.1 From 3e0547ea2a57dcf96d319a6597903aec8628f437 Mon Sep 17 00:00:00 2001 From: Tobias Koenig Date: Fri, 29 Sep 2006 11:36:01 +0000 Subject: Add support for finding embedded version of MySql svn path=/trunk/KDE/kdelibs/; revision=590147 --- modules/FindMySQL.cmake | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'modules/FindMySQL.cmake') diff --git a/modules/FindMySQL.cmake b/modules/FindMySQL.cmake index 426f11ed..dd50ed54 100644 --- a/modules/FindMySQL.cmake +++ b/modules/FindMySQL.cmake @@ -1,9 +1,11 @@ -# - Find MySQL +# - Find MySQL / MySQL Embedded # Find the MySQL includes and client library # This module defines # MYSQL_INCLUDE_DIR, where to find mysql.h # MYSQL_LIBRARIES, the libraries needed to use MySQL. +# MYSQL_EMBEDDED_LIBRARIES, the libraries needed to use MySQL Embedded. # MYSQL_FOUND, If false, do not try to use MySQL. +# MYSQL_EMBEDDED_FOUND, If false, do not try to use MySQL Embedded. # # Copyright (c) 2006, Jaroslaw Staniek, # @@ -22,6 +24,13 @@ find_library(MYSQL_LIBRARIES NAMES mysqlclient /usr/local/lib/mysql ) +find_library(MYSQL_EMBEDDED_LIBRARIES NAMES mysqld + PATHS + /usr/lib/mysql + /usr/local/lib/mysql + /opt/mysql/lib/mysql +) + if(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES) set(MYSQL_FOUND TRUE) message(STATUS "Found MySQL: ${MYSQL_INCLUDE_DIR}, ${MYSQL_LIBRARIES}") @@ -30,5 +39,12 @@ else(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES) message(STATUS "MySQL not found.") endif(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES) -mark_as_advanced(MYSQL_INCLUDE_DIR MYSQL_LIBRARIES) +if(MYSQL_INCLUDE_DIR AND MYSQL_EMBEDDED_LIBRARIES) + set(MYSQL_EMBEDDED_FOUND TRUE) + message(STATUS "Found MySQL Embedded: ${MYSQL_INCLUDE_DIR}, ${MYSQL_EMBEDDED_LIBRARIES}") +else(MYSQL_INCLUDE_DIR AND MYSQL_EMBEDDED_LIBRARIES) + set(MYSQL_EMBEDDED_FOUND FALSE) + message(STATUS "MySQL Embedded not found.") +endif(MYSQL_INCLUDE_DIR AND MYSQL_EMBEDDED_LIBRARIES) +mark_as_advanced(MYSQL_INCLUDE_DIR MYSQL_LIBRARIES MYSQL_EMBEDDED_LIBRARIES) -- cgit v1.2.1 From 79952de539eb4dd639456fcf0d475207ec71bacf Mon Sep 17 00:00:00 2001 From: Volker Krause Date: Fri, 13 Oct 2006 09:30:09 +0000 Subject: Check for MYSQL_OPT_USE_EMBEDDED_CONNECTION enum value. svn path=/trunk/KDE/kdelibs/; revision=595072 --- modules/FindMySQL.cmake | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'modules/FindMySQL.cmake') diff --git a/modules/FindMySQL.cmake b/modules/FindMySQL.cmake index dd50ed54..a61f62ac 100644 --- a/modules/FindMySQL.cmake +++ b/modules/FindMySQL.cmake @@ -31,6 +31,12 @@ find_library(MYSQL_EMBEDDED_LIBRARIES NAMES mysqld /opt/mysql/lib/mysql ) +macro_push_required_vars() +set( CMAKE_REQUIRED_INCLUDES ${MYSQL_INCLUDE_DIR} ) +set( CMAKE_REQUIRED_LIBRARIES ${MYSQL_EMBEDDED_LIBRARIES} ) +check_cxx_source_compiles( "#include \nint main() { int i = MYSQL_OPT_USE_EMBEDDED_CONNECTION; }" HAVE_MYSQL_OPT_EMBEDDED_CONNECTION ) +macro_pop_required_vars() + if(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES) set(MYSQL_FOUND TRUE) message(STATUS "Found MySQL: ${MYSQL_INCLUDE_DIR}, ${MYSQL_LIBRARIES}") @@ -39,12 +45,12 @@ else(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES) message(STATUS "MySQL not found.") endif(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES) -if(MYSQL_INCLUDE_DIR AND MYSQL_EMBEDDED_LIBRARIES) +if(MYSQL_INCLUDE_DIR AND MYSQL_EMBEDDED_LIBRARIES AND HAVE_MYSQL_OPT_USE_EMBEDDED_CONNECTION) set(MYSQL_EMBEDDED_FOUND TRUE) message(STATUS "Found MySQL Embedded: ${MYSQL_INCLUDE_DIR}, ${MYSQL_EMBEDDED_LIBRARIES}") -else(MYSQL_INCLUDE_DIR AND MYSQL_EMBEDDED_LIBRARIES) +else(MYSQL_INCLUDE_DIR AND MYSQL_EMBEDDED_LIBRARIES AND HAVE_MYSQL_OPT_USE_EMBEDDED_CONNECTION) set(MYSQL_EMBEDDED_FOUND FALSE) message(STATUS "MySQL Embedded not found.") -endif(MYSQL_INCLUDE_DIR AND MYSQL_EMBEDDED_LIBRARIES) +endif(MYSQL_INCLUDE_DIR AND MYSQL_EMBEDDED_LIBRARIES AND HAVE_MYSQL_OPT_USE_EMBEDDED_CONNECTION) mark_as_advanced(MYSQL_INCLUDE_DIR MYSQL_LIBRARIES MYSQL_EMBEDDED_LIBRARIES) -- cgit v1.2.1 From 54ec2440a320f0be3868fdd13cde1211c30cfe2e Mon Sep 17 00:00:00 2001 From: Will Stephenson Date: Fri, 12 Jan 2007 13:59:17 +0000 Subject: Fix the check for MySQL Embedded svn path=/trunk/KDE/kdelibs/; revision=622624 --- modules/FindMySQL.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'modules/FindMySQL.cmake') diff --git a/modules/FindMySQL.cmake b/modules/FindMySQL.cmake index a61f62ac..daa6d84f 100644 --- a/modules/FindMySQL.cmake +++ b/modules/FindMySQL.cmake @@ -45,12 +45,12 @@ else(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES) message(STATUS "MySQL not found.") endif(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES) -if(MYSQL_INCLUDE_DIR AND MYSQL_EMBEDDED_LIBRARIES AND HAVE_MYSQL_OPT_USE_EMBEDDED_CONNECTION) +if(MYSQL_INCLUDE_DIR AND MYSQL_EMBEDDED_LIBRARIES AND HAVE_MYSQL_OPT_EMBEDDED_CONNECTION) set(MYSQL_EMBEDDED_FOUND TRUE) message(STATUS "Found MySQL Embedded: ${MYSQL_INCLUDE_DIR}, ${MYSQL_EMBEDDED_LIBRARIES}") -else(MYSQL_INCLUDE_DIR AND MYSQL_EMBEDDED_LIBRARIES AND HAVE_MYSQL_OPT_USE_EMBEDDED_CONNECTION) +else(MYSQL_INCLUDE_DIR AND MYSQL_EMBEDDED_LIBRARIES AND HAVE_MYSQL_OPT_EMBEDDED_CONNECTION) set(MYSQL_EMBEDDED_FOUND FALSE) message(STATUS "MySQL Embedded not found.") -endif(MYSQL_INCLUDE_DIR AND MYSQL_EMBEDDED_LIBRARIES AND HAVE_MYSQL_OPT_USE_EMBEDDED_CONNECTION) +endif(MYSQL_INCLUDE_DIR AND MYSQL_EMBEDDED_LIBRARIES AND HAVE_MYSQL_OPT_EMBEDDED_CONNECTION) mark_as_advanced(MYSQL_INCLUDE_DIR MYSQL_LIBRARIES MYSQL_EMBEDDED_LIBRARIES) -- cgit v1.2.1 From 814455b7ad321c88e730662fda58261087b72e72 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Mon, 18 Feb 2008 19:06:32 +0000 Subject: some improvements to the docs: -some modules were not at all documented, only few are left now -the copyright message doesn't have to be printed for every module in the docs -fix FindKorundom.cmake, it didn't follow the style guide and had typos (e.g. Korumdum_FOUND instead of KORUNDUM_FOUND) Alex (will commit modified FindKDE4Internal.cmake after Christians commit) svn path=/trunk/KDE/kdelibs/; revision=776742 --- modules/FindMySQL.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindMySQL.cmake') diff --git a/modules/FindMySQL.cmake b/modules/FindMySQL.cmake index daa6d84f..21604c73 100644 --- a/modules/FindMySQL.cmake +++ b/modules/FindMySQL.cmake @@ -6,7 +6,7 @@ # MYSQL_EMBEDDED_LIBRARIES, the libraries needed to use MySQL Embedded. # MYSQL_FOUND, If false, do not try to use MySQL. # MYSQL_EMBEDDED_FOUND, If false, do not try to use MySQL Embedded. -# + # Copyright (c) 2006, Jaroslaw Staniek, # # Redistribution and use is allowed according to the terms of the BSD license. -- cgit v1.2.1 From bbf81d6e9d7e8d520fe01850a975a257e7c71754 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaros=C5=82aw=20Staniek?= Date: Sat, 8 Nov 2008 17:06:19 +0000 Subject: detection on mysql much improved, esp. on Windows (taken form branches/work/predicate) svn path=/trunk/KDE/kdelibs/; revision=881641 --- modules/FindMySQL.cmake | 116 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 102 insertions(+), 14 deletions(-) (limited to 'modules/FindMySQL.cmake') diff --git a/modules/FindMySQL.cmake b/modules/FindMySQL.cmake index 21604c73..4d32661c 100644 --- a/modules/FindMySQL.cmake +++ b/modules/FindMySQL.cmake @@ -1,36 +1,124 @@ -# - Find MySQL / MySQL Embedded +# - Try to find MySQL / MySQL Embedded library # Find the MySQL includes and client library # This module defines # MYSQL_INCLUDE_DIR, where to find mysql.h # MYSQL_LIBRARIES, the libraries needed to use MySQL. +# MYSQL_LIB_DIR, path to the MYSQL_LIBRARIES # MYSQL_EMBEDDED_LIBRARIES, the libraries needed to use MySQL Embedded. +# MYSQL_EMBEDDED_LIB_DIR, path to the MYSQL_EMBEDDED_LIBRARIES # MYSQL_FOUND, If false, do not try to use MySQL. # MYSQL_EMBEDDED_FOUND, If false, do not try to use MySQL Embedded. -# Copyright (c) 2006, Jaroslaw Staniek, +# Copyright (c) 2006-2008, Jarosław Staniek # # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. +include(CheckCXXSourceCompiles) +include(MacroPushRequiredVars) -find_path(MYSQL_INCLUDE_DIR mysql.h - /usr/include/mysql - /usr/local/include/mysql -) +if(WIN32) + find_path(MYSQL_INCLUDE_DIR mysql.h + PATHS + $ENV{MYSQL_INCLUDE_DIR} + $ENV{MYSQL_DIR}/include + $ENV{ProgramFiles}/MySQL/*/include + $ENV{SystemDrive}/MySQL/*/include + ) +else(WIN32) + find_path(MYSQL_INCLUDE_DIR mysql.h + PATHS + $ENV{MYSQL_INCLUDE_DIR} + $ENV{MYSQL_DIR}/include + /usr/include/mysql + /usr/local/include/mysql + /usr/local/mysql/include + /usr/local/mysql/include/mysql + /opt/mysql/mysql/include + /opt/mysql/mysql/include/mysql + ) +endif(WIN32) -find_library(MYSQL_LIBRARIES NAMES mysqlclient - PATHS - /usr/lib/mysql - /usr/local/lib/mysql -) +if(WIN32) + # path suffix for debug/release mode + # binary_dist: mysql binary distribution + # build_dist: custom build + if(CMAKE_BUILD_TYPE STREQUAL "Debug") + set(binary_dist debug) + set(build_dist Debug) + else(CMAKE_BUILD_TYPE STREQUAL "Debug") + ADD_DEFINITIONS(-DDBUG_OFF) + set(binary_dist opt) + set(build_dist Release) + endif(CMAKE_BUILD_TYPE STREQUAL "Debug") + +# find_library(MYSQL_LIBRARIES NAMES mysqlclient + find_library(MYSQL_LIBRARIES NAMES libmysql + PATHS + $ENV{MYSQL_DIR}/lib/${binary_dist} + $ENV{MYSQL_DIR}/libmysql/${build_dist} + $ENV{MYSQL_DIR}/client/${build_dist} + $ENV{ProgramFiles}/MySQL/*/lib/${binary_dist} + $ENV{SystemDrive}/MySQL/*/lib/${binary_dist} + ) +else(WIN32) +# find_library(MYSQL_LIBRARIES NAMES mysqlclient + find_library(MYSQL_LIBRARIES NAMES libmysql + PATHS + $ENV{MYSQL_DIR}/libmysql_r/.libs + $ENV{MYSQL_DIR}/lib + $ENV{MYSQL_DIR}/lib/mysql + /usr/lib/mysql + /usr/local/lib/mysql + /usr/local/mysql/lib + /usr/local/mysql/lib/mysql + /opt/mysql/mysql/lib + /opt/mysql/mysql/lib/mysql + ) +endif(WIN32) + +if(WIN32) + set(MYSQL_LIB_PATHS + $ENV{MYSQL_DIR}/lib/opt + $ENV{MYSQL_DIR}/client/release + $ENV{ProgramFiles}/MySQL/*/lib/opt + $ENV{SystemDrive}/MySQL/*/lib/opt + ) + find_library(MYSQL_LIBRARIES NAMES mysqlclient + PATHS + ${MYSQL_LIB_PATHS} + ) +else(WIN32) + set(MYSQL_LIB_PATHS + $ENV{MYSQL_DIR}/libmysql_r/.libs + $ENV{MYSQL_DIR}/lib + $ENV{MYSQL_DIR}/lib/mysql + /usr/lib/mysql + /usr/local/lib/mysql + /usr/local/mysql/lib + /usr/local/mysql/lib/mysql + /opt/mysql/mysql/lib + /opt/mysql/mysql/lib/mysql + ) + find_library(MYSQL_LIBRARIES NAMES mysqlclient + PATHS + ${MYSQL_LIB_PATHS} + ) +endif(WIN32) find_library(MYSQL_EMBEDDED_LIBRARIES NAMES mysqld PATHS - /usr/lib/mysql - /usr/local/lib/mysql - /opt/mysql/lib/mysql + ${MYSQL_LIB_PATHS} ) +if(MYSQL_LIBRARIES) + get_filename_component(MYSQL_LIB_DIR ${MYSQL_LIBRARIES} PATH) +endif(MYSQL_LIBRARIES) + +if(MYSQL_EMBEDDED_LIBRARIES) + get_filename_component(MYSQL_EMBEDDED_LIB_DIR ${MYSQL_EMBEDDED_LIBRARIES} PATH) +endif(MYSQL_EMBEDDED_LIBRARIES) + macro_push_required_vars() set( CMAKE_REQUIRED_INCLUDES ${MYSQL_INCLUDE_DIR} ) set( CMAKE_REQUIRED_LIBRARIES ${MYSQL_EMBEDDED_LIBRARIES} ) -- cgit v1.2.1 From b670cd61d11bc6aee66bd95f53cc2512ffd98e0f Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sun, 9 Nov 2008 16:59:29 +0000 Subject: -use PATH_SUFFIXES instead of listing each subdir twice, once with and once without mysql appended Alex Jarosloaw: can you please check that this still works as you expect ? CCMAIL: js@iidea.pl svn path=/trunk/KDE/kdelibs/; revision=882056 --- modules/FindMySQL.cmake | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'modules/FindMySQL.cmake') diff --git a/modules/FindMySQL.cmake b/modules/FindMySQL.cmake index 4d32661c..6a0f8941 100644 --- a/modules/FindMySQL.cmake +++ b/modules/FindMySQL.cmake @@ -30,12 +30,10 @@ else(WIN32) PATHS $ENV{MYSQL_INCLUDE_DIR} $ENV{MYSQL_DIR}/include - /usr/include/mysql - /usr/local/include/mysql /usr/local/mysql/include - /usr/local/mysql/include/mysql /opt/mysql/mysql/include - /opt/mysql/mysql/include/mysql + PATH_SUFFIXES + mysql ) endif(WIN32) @@ -68,12 +66,10 @@ else(WIN32) $ENV{MYSQL_DIR}/libmysql_r/.libs $ENV{MYSQL_DIR}/lib $ENV{MYSQL_DIR}/lib/mysql - /usr/lib/mysql - /usr/local/lib/mysql /usr/local/mysql/lib - /usr/local/mysql/lib/mysql /opt/mysql/mysql/lib - /opt/mysql/mysql/lib/mysql + PATH_SUFFIXES + mysql ) endif(WIN32) @@ -93,12 +89,10 @@ else(WIN32) $ENV{MYSQL_DIR}/libmysql_r/.libs $ENV{MYSQL_DIR}/lib $ENV{MYSQL_DIR}/lib/mysql - /usr/lib/mysql - /usr/local/lib/mysql /usr/local/mysql/lib - /usr/local/mysql/lib/mysql /opt/mysql/mysql/lib - /opt/mysql/mysql/lib/mysql + PATH_SUFFIXES + mysql ) find_library(MYSQL_LIBRARIES NAMES mysqlclient PATHS -- cgit v1.2.1 From 6f3e9e9fb2fce5412ef5e4b710f52d965e20d337 Mon Sep 17 00:00:00 2001 From: David Faure Date: Wed, 19 Aug 2009 08:57:47 +0000 Subject: aclemens asked whether CMAKE_BUILD_TYPE was case sensitive; it's not, except for those two buggy checks - fixed. svn path=/trunk/KDE/kdelibs/; revision=1013192 --- modules/FindMySQL.cmake | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'modules/FindMySQL.cmake') diff --git a/modules/FindMySQL.cmake b/modules/FindMySQL.cmake index 6a0f8941..78332714 100644 --- a/modules/FindMySQL.cmake +++ b/modules/FindMySQL.cmake @@ -38,18 +38,20 @@ else(WIN32) endif(WIN32) if(WIN32) + string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_TOLOWER) + # path suffix for debug/release mode # binary_dist: mysql binary distribution # build_dist: custom build - if(CMAKE_BUILD_TYPE STREQUAL "Debug") + if(CMAKE_BUILD_TYPE_TOLOWER STREQUAL "debug") set(binary_dist debug) set(build_dist Debug) - else(CMAKE_BUILD_TYPE STREQUAL "Debug") + else(CMAKE_BUILD_TYPE_TOLOWER STREQUAL "debug") ADD_DEFINITIONS(-DDBUG_OFF) set(binary_dist opt) set(build_dist Release) - endif(CMAKE_BUILD_TYPE STREQUAL "Debug") - + endif(CMAKE_BUILD_TYPE_TOLOWER STREQUAL "debug") + # find_library(MYSQL_LIBRARIES NAMES mysqlclient find_library(MYSQL_LIBRARIES NAMES libmysql PATHS -- cgit v1.2.1 From d3168e3612d88480cf26d2e3ea846d7564f6f6cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaros=C5=82aw=20Staniek?= Date: Wed, 23 Sep 2009 13:18:14 +0000 Subject: use MATCHES to cover more debug targets svn path=/trunk/KDE/kdelibs/; revision=1027171 --- modules/FindMySQL.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'modules/FindMySQL.cmake') diff --git a/modules/FindMySQL.cmake b/modules/FindMySQL.cmake index 78332714..39128666 100644 --- a/modules/FindMySQL.cmake +++ b/modules/FindMySQL.cmake @@ -43,14 +43,14 @@ if(WIN32) # path suffix for debug/release mode # binary_dist: mysql binary distribution # build_dist: custom build - if(CMAKE_BUILD_TYPE_TOLOWER STREQUAL "debug") + if(CMAKE_BUILD_TYPE_TOLOWER MATCHES "debug") set(binary_dist debug) set(build_dist Debug) - else(CMAKE_BUILD_TYPE_TOLOWER STREQUAL "debug") + else(CMAKE_BUILD_TYPE_TOLOWER MATCHES "debug") ADD_DEFINITIONS(-DDBUG_OFF) set(binary_dist opt) set(build_dist Release) - endif(CMAKE_BUILD_TYPE_TOLOWER STREQUAL "debug") + endif(CMAKE_BUILD_TYPE_TOLOWER MATCHES "debug") # find_library(MYSQL_LIBRARIES NAMES mysqlclient find_library(MYSQL_LIBRARIES NAMES libmysql -- cgit v1.2.1