diff options
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/compiler/msvc/settings.cmake | 4 | ||||
| -rw-r--r-- | cmake/macros/FindMySQL.cmake | 130 | ||||
| -rw-r--r-- | cmake/macros/FindZMQ.cmake | 2 |
3 files changed, 107 insertions, 29 deletions
diff --git a/cmake/compiler/msvc/settings.cmake b/cmake/compiler/msvc/settings.cmake index 6407b6cd5c4..bd39f3cade4 100644 --- a/cmake/compiler/msvc/settings.cmake +++ b/cmake/compiler/msvc/settings.cmake @@ -19,8 +19,8 @@ if(PLATFORM EQUAL 64) message(STATUS "MSVC: 64-bit platform, enforced -D_WIN64 parameter") #Enable extended object support for debug compiles on X64 (not required on X86) - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /bigobj") - message(STATUS "MSVC: Enabled extended object-support for debug-compiles") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj") + message(STATUS "MSVC: Enabled increased number of sections in object files") else() # mark 32 bit executables large address aware so they can use > 2GB address space set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE") diff --git a/cmake/macros/FindMySQL.cmake b/cmake/macros/FindMySQL.cmake index 40fa716ed69..02d17ab48f2 100644 --- a/cmake/macros/FindMySQL.cmake +++ b/cmake/macros/FindMySQL.cmake @@ -86,15 +86,33 @@ find_path(MYSQL_INCLUDE_DIR /usr/local/include /usr/local/include/mysql /usr/local/mysql/include - "${PROGRAM_FILES_64}/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" - "${PROGRAM_FILES_32}/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" "C:/MySQL/include" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\*;Location]/include" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\*;Location]/include" - "$ENV{ProgramFiles}/MySQL/*/include" - "$ENV{SystemDrive}/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 @@ -124,19 +142,49 @@ if( WIN32 ) libmysql PATHS ${MYSQL_ADD_LIBRARIES_PATH} - "${PROGRAM_FILES_64}/MySQL/*/lib" - "${PROGRAM_FILES_64}/MySQL/*/lib/opt" + "${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" - "${PROGRAM_FILES_32}/MySQL/*/lib" - "${PROGRAM_FILES_32}/MySQL/*/lib/opt" + "${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" "C:/MySQL/lib/debug" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\*;Location]/lib" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\*;Location]/lib/opt" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\*;Location]/lib" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\*;Location]/lib/opt" - "$ENV{ProgramFiles}/MySQL/*/lib/opt" - "$ENV{SystemDrive}/MySQL/*/lib/opt" + "[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." @@ -175,19 +223,49 @@ endif( UNIX ) if( WIN32 ) find_program(MYSQL_EXECUTABLE mysql PATHS - "${PROGRAM_FILES_64}/MySQL/*/bin" - "${PROGRAM_FILES_64}/MySQL/*/bin/opt" + "${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" - "${PROGRAM_FILES_32}/MySQL/*/bin" - "${PROGRAM_FILES_32}/MySQL/*/bin/opt" + "${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" "C:/MySQL/bin/debug" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\*;Location]/bin" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\*;Location]/bin/opt" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\*;Location]/bin" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\*;Location]/bin/opt" - "$ENV{ProgramFiles}/MySQL/*/bin/opt" - "$ENV{SystemDrive}/MySQL/*/bin/opt" + "[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 diff --git a/cmake/macros/FindZMQ.cmake b/cmake/macros/FindZMQ.cmake index c442f3d162c..d538257e3b3 100644 --- a/cmake/macros/FindZMQ.cmake +++ b/cmake/macros/FindZMQ.cmake @@ -72,7 +72,7 @@ find_library(ZMQ_LIBRARY "${ZMQ_ROOT_DIR}/lib" ) -if (ZMQ_INCLUDE_DIR AND ZMQ_LIBRARY) +if (ZMQ_INCLUDE_DIR AND ZMQ_LIBRARY AND NOT ZMQ_LIBRARY-NOTFOUND) set(ZMQ_FOUND 1) message(STATUS "Found ZMQ library: ${ZMQ_LIBRARY}") message(STATUS "Found ZMQ headers: ${ZMQ_INCLUDE_DIR}") |