Mercurial > hg > orthanc-databases

comparison Resources/CMake/MariaDBConfiguration.cmake @ 183:2f94b2046d7c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
upgrade to openssl 1.1.1, fix build if using MinGW 32bits
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 15 Dec 2020 10:04:35 +0100
parents d9101318442d
children e8c3c92f2532
comparison
equal deleted inserted replaced
182:e01322c61094 183:2f94b2046d7c
128 PROPERTY COMPILE_DEFINITIONS "HAVE_OPENSSL=1;HAVE_TLS=1;HAVE_REMOTEIO=1;HAVE_COMPRESS=1;LIBMARIADB;THREAD" 128 PROPERTY COMPILE_DEFINITIONS "HAVE_OPENSSL=1;HAVE_TLS=1;HAVE_REMOTEIO=1;HAVE_COMPRESS=1;LIBMARIADB;THREAD"
129 ) 129 )
130 130
131 if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows") 131 if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
132 link_libraries(shlwapi) 132 link_libraries(shlwapi)
133
134 # MariaDB connector requires the fibers API (file "fibersapi.h",
135 # e.g. function "IsThreadAFiber()"), that was introduced in
136 # Windows Vista. This is done by redefining the "_WIN32_WINNT"
137 # macro that is initially set to 0x501 (Windows XP) in
138 # "OrthancFramework/Resources/CMake/Compiler.cmake".
139 # https://docs.microsoft.com/en-us/windows/win32/api/fibersapi/nf-fibersapi-isthreadafiber
140 remove_definitions(
141 -DWINVER=0x0501
142 -D_WIN32_WINNT=0x0501
143 )
144 add_definitions(
145 -DWINVER=0x0600
146 -D_WIN32_WINNT=0x0600
147 )
133 endif() 148 endif()
134 149
135 else() 150 else()
136 find_path(MYSQLCLIENT_INCLUDE_DIR mysql.h 151 find_path(MYSQLCLIENT_INCLUDE_DIR mysql.h
137 /usr/local/include/mysql 152 /usr/local/include/mysql