diff --git a/CMakeSettings.json b/CMakeSettings.json index c623adf2..7a6006fe 100644 --- a/CMakeSettings.json +++ b/CMakeSettings.json @@ -1,22 +1,6 @@ { // See https://go.microsoft.com//fwlink//?linkid=834763 for more information about this file. "configurations": [ - { - "name": "x86-Debug", - "generator": "Visual Studio 15 2017", - "configurationType": "Debug", - "buildRoot": "${env.USERPROFILE}\\CMakeBuild\\${workspaceHash}\\build\\${name}", - "cmakeCommandArgs": "-DCMAKE_BUILD_TYPE=\"Debug\"", - "buildCommandArgs": "-m -v:minimal" - }, - { - "name": "x86-Release", - "generator": "Visual Studio 15 2017", - "configurationType": "Release", - "buildRoot": "${env.USERPROFILE}\\CMakeBuild\\${workspaceHash}\\build\\${name}", - "cmakeCommandArgs": "", - "buildCommandArgs": "-m -v:minimal" - }, { "name": "x64-Debug", "generator": "Visual Studio 15 2017 Win64", diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake index 5fd19dae..52f25ac7 100644 --- a/cmake/FindMySQL.cmake +++ b/cmake/FindMySQL.cmake @@ -64,12 +64,6 @@ if( UNIX ) endif( UNIX ) if( WIN32 ) - # read environment variables and change \ to / - SET(PROGRAM_FILES_32 $ENV{ProgramFiles}) - if (${PROGRAM_FILES_32}) - STRING(REPLACE "\\\\" "/" PROGRAM_FILES_32 ${PROGRAM_FILES_32}) - endif(${PROGRAM_FILES_32}) - SET(PROGRAM_FILES_64 $ENV{ProgramW6432}) if (${PROGRAM_FILES_64}) STRING(REPLACE "\\\\" "/" PROGRAM_FILES_64 ${PROGRAM_FILES_64}) @@ -86,33 +80,12 @@ find_path(MYSQL_INCLUDE_DIR /usr/local/include /usr/local/include/mysql /usr/local/mysql/include - "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.7/include" - "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.6/include" - "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.5/include" - "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.1/include" - "${PROGRAM_FILES_32}/MySQL/include" "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/include" - "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.6/include" - "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.5/include" - "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.1/include" "${PROGRAM_FILES_64}/MySQL/include" "C:/MySQL/include" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]/include" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.6;Location]/include" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.5;Location]/include" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.1;Location]/include" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.7;Location]/include" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.6;Location]/include" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.5;Location]/include" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.1;Location]/include" "$ENV{ProgramFiles}/MySQL/MySQL Server 5.7/include" - "$ENV{ProgramFiles}/MySQL/MySQL Server 5.6/include" - "$ENV{ProgramFiles}/MySQL/MySQL Server 5.5/include" - "$ENV{ProgramFiles}/MySQL/MySQL Server 5.1/include" "$ENV{SystemDrive}/MySQL/MySQL Server 5.7/include" - "$ENV{SystemDrive}/MySQL/MySQL Server 5.6/include" - "$ENV{SystemDrive}/MySQL/MySQL Server 5.5/include" - "$ENV{SystemDrive}/MySQL/MySQL Server 5.1/include" "c:/msys/local/include" "$ENV{MYSQL_ROOT}/include" DOC @@ -142,49 +115,14 @@ if( WIN32 ) libmysql PATHS ${MYSQL_ADD_LIBRARIES_PATH} - "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.7/lib" - "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.6/lib" - "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.5/lib" - "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.1/lib" - "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.7/lib/opt" - "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.6/lib/opt" - "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.5/lib/opt" - "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.1/lib/opt" - "${PROGRAM_FILES_32}/MySQL/lib" "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/lib" - "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.6/lib" - "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.5/lib" - "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.1/lib" "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/lib/opt" - "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.6/lib/opt" - "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.5/lib/opt" - "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.1/lib/opt" "${PROGRAM_FILES_64}/MySQL/lib" "C:/MySQL/lib/debug" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]/lib" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.6;Location]/lib" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.5;Location]/lib" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.1;Location]/lib" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]/lib/opt" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.6;Location]/lib/opt" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.5;Location]/lib/opt" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.1;Location]/lib/opt" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.7;Location]/lib" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.6;Location]/lib" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.5;Location]/lib" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.1;Location]/lib" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.7;Location]/lib/opt" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.6;Location]/lib/opt" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.5;Location]/lib/opt" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.1;Location]/lib/opt" "$ENV{ProgramFiles}/MySQL/MySQL Server 5.7/lib/opt" - "$ENV{ProgramFiles}/MySQL/MySQL Server 5.6/lib/opt" - "$ENV{ProgramFiles}/MySQL/MySQL Server 5.5/lib/opt" - "$ENV{ProgramFiles}/MySQL/MySQL Server 5.1/lib/opt" "$ENV{SystemDrive}/MySQL/MySQL Server 5.7/lib/opt" - "$ENV{SystemDrive}/MySQL/MySQL Server 5.6/lib/opt" - "$ENV{SystemDrive}/MySQL/MySQL Server 5.5/lib/opt" - "$ENV{SystemDrive}/MySQL/MySQL Server 5.1/lib/opt" "c:/msys/local/include" "$ENV{MYSQL_ROOT}/lib" DOC "Specify the location of the mysql library here." @@ -223,49 +161,14 @@ endif( UNIX ) if( WIN32 ) find_program(MYSQL_EXECUTABLE mysql PATHS - "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.7/bin" - "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.6/bin" - "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.5/bin" - "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.1/bin" - "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.7/bin/opt" - "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.6/bin/opt" - "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.5/bin/opt" - "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.1/bin/opt" - "${PROGRAM_FILES_32}/MySQL/bin" "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/bin" - "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.6/bin" - "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.5/bin" - "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.1/bin" "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/bin/opt" - "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.6/bin/opt" - "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.5/bin/opt" - "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.1/bin/opt" "${PROGRAM_FILES_64}/MySQL/bin" "C:/MySQL/bin/debug" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]/bin" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.6;Location]/bin" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.5;Location]/bin" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.1;Location]/bin" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]/bin/opt" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.6;Location]/bin/opt" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.5;Location]/bin/opt" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.1;Location]/bin/opt" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.7;Location]/bin" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.6;Location]/bin" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.5;Location]/bin" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.1;Location]/bin" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.7;Location]/bin/opt" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.6;Location]/bin/opt" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.5;Location]/bin/opt" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.1;Location]/bin/opt" "$ENV{ProgramFiles}/MySQL/MySQL Server 5.7/bin/opt" - "$ENV{ProgramFiles}/MySQL/MySQL Server 5.6/bin/opt" - "$ENV{ProgramFiles}/MySQL/MySQL Server 5.5/bin/opt" - "$ENV{ProgramFiles}/MySQL/MySQL Server 5.1/bin/opt" "$ENV{SystemDrive}/MySQL/MySQL Server 5.7/bin/opt" - "$ENV{SystemDrive}/MySQL/MySQL Server 5.6/bin/opt" - "$ENV{SystemDrive}/MySQL/MySQL Server 5.5/bin/opt" - "$ENV{SystemDrive}/MySQL/MySQL Server 5.1/bin/opt" "c:/msys/local/include" "$ENV{MYSQL_ROOT}/bin" DOC