Skip to content

Commit

Permalink
fix MacOS CI
Browse files Browse the repository at this point in the history
  • Loading branch information
hggq committed Apr 30, 2024
1 parent 3c32002 commit c909cdf
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
11 changes: 9 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,13 @@ if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
include_sub_directories_recursively(/usr/local/opt/mysql-client/include)
endif()

if (IS_DIRECTORY "/opt/homebrew/opt/mysql")
MESSAGE( STATUS "/opt/homebrew/opt/mysql")
set(MYSQL_INCLUDE_DIR "/opt/homebrew/opt/mysql/include")
include_sub_directories_recursively(/opt/homebrew/opt/mysql/include)
endif()


if (IS_DIRECTORY "/opt/homebrew/opt/mysql-client")
MESSAGE( STATUS "/opt/homebrew/opt/mysql-client")
set(MYSQL_INCLUDE_DIR "/opt/homebrew/opt/mysql-client/include")
Expand All @@ -360,7 +367,7 @@ endif()


FIND_PATH(MYSQL_INCLUDE_DIR NAMES mysql.h
PATHS /usr/local/include/mysql /usr/include/mysql /usr/local/opt/mysql-client/include /opt/homebrew/opt/mysql-client/include
PATHS /usr/local/include/mysql /usr/include/mysql /opt/homebrew/opt/mysql/include /usr/local/opt/mysql-client/include /opt/homebrew/opt/mysql-client/include
)

MESSAGE( STATUS "MYSQL_ROOT_DIR = ${MYSQL_ROOT_DIR} ")
Expand All @@ -374,7 +381,7 @@ endif()
SET(MYSQL_NAMES mysqlclient)
FIND_LIBRARY(MYSQL_LIBRARY
NAMES ${MYSQL_NAMES}
PATHS /usr/lib /usr/local/lib /usr/local/mysql/lib /usr/local/opt/mysql/lib /opt/homebrew/opt/mysql-client/lib
PATHS /usr/lib /usr/local/lib /usr/local/mysql/lib /usr/local/opt/mysql/lib /opt/homebrew/opt/mysql/lib /opt/homebrew/opt/mysql-client/lib
PATH_SUFFIXES mysql
)

Expand Down
2 changes: 1 addition & 1 deletion vendor/httpserver/src/loadmodule.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ std::mutex loadcontrolmtx, loadviewmtx, moudulecachemethod;
std::string httpempty([[maybe_unused]] OBJ_VALUE &a) { return "<p>--.so image not found--</p>"; }
std::string httpso(std::shared_ptr<httppeer> peer)
{
httppeer &client = peer->getpeer();
httppeer &client = peer->get_peer();
client << "<p>-- controller not found--</p>";
return "";
}
Expand Down

0 comments on commit c909cdf

Please sign in to comment.