summaryrefslogtreecommitdiff
path: root/src/cmake
diff options
context:
space:
mode:
authorYehonal <yehonal.azeroth@gmail.com>2022-10-22 15:40:13 +0200
committerGitHub <noreply@github.com>2022-10-22 15:40:13 +0200
commit171df31196dc54b662ef7967d5b3d5ae3fc2eefc (patch)
tree1bb317c3b51de1b7549cdb5c1c598f2a50a5b517 /src/cmake
parentb35c907cde030f4ce4ee9162d016ba93f05d94ff (diff)
feat(CORE/bash): implemented acore dashboard for Windows (#13476)
+ implemented acore dashboard for windows + integrated acore dashboard for windows in our pipeline + implemented dry run for windows build + fixed permissions issue for all the operating systems + code clean
Diffstat (limited to 'src/cmake')
-rw-r--r--src/cmake/macros/FindMySQL.cmake3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/cmake/macros/FindMySQL.cmake b/src/cmake/macros/FindMySQL.cmake
index 81f6dd18b5..2feb770558 100644
--- a/src/cmake/macros/FindMySQL.cmake
+++ b/src/cmake/macros/FindMySQL.cmake
@@ -170,6 +170,7 @@ find_path(MYSQL_INCLUDE_DIR
/usr/local/include
/usr/local/include/mysql
/usr/local/mysql/include
+ "C:/tools/mysql/current/include" # chocolatey package
"C:/Program Files/MySQL/MySQL Server 8.0/include"
"C:/Program Files/MySQL/MySQL Server 5.7/include"
"C:/Program Files/MySQL/include"
@@ -209,6 +210,7 @@ if( WIN32 )
libmysql
PATHS
${MYSQL_ADD_LIBRARIES_PATH}
+ "C:/tools/mysql/current/lib" # chocolatey package
"C:/Program Files/MySQL/MySQL Server 8.0/lib"
"C:/Program Files/MySQL/MySQL Server 8.0/lib/opt"
"C:/Program Files/MySQL/MySQL Server 5.7/lib/opt"
@@ -261,6 +263,7 @@ endif( UNIX )
if( WIN32 )
find_program(MYSQL_EXECUTABLE mysql
PATHS
+ "C:/tools/mysql/current/bin" # chocolatey package
"${PROGRAM_FILES_64}/MySQL/MySQL Server 8.0/bin"
"${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/bin"
"${PROGRAM_FILES_64}/MySQL/MySQL Server 8.0/bin/opt"