add section field update

qicosmos · May 8, 2024 · 65bca5c · 65bca5c
1 parent f3f4d79
commit 65bca5c
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 25 deletions.
diff --git a/.github/workflows/ci-mysql.yml b/.github/workflows/ci-mysql.yml
@@ -24,20 +24,14 @@ jobs:
           mysql-version: 8.0
           database: test_ormppdb
 
-      - name: Test
-        if  : startsWith(matrix.os, 'macos')
-        run : |
-          sudo find / -name "mysql.h"
-          sudo find / -name "*mysqlclient*"
-
       - name: Configure cmake
         run : cmake -B${{ github.workspace }}/build -DCMAKE_BUILD_TYPE=${{ matrix.configuration }} -DENABLE_MYSQL=ON
-      
+
       - name: Build
         run : cmake --build ${{ github.workspace }}/build --config ${{ matrix.configuration }}
 
       - name: Test
         working-directory: ${{ github.workspace }}/build
         env :
           CTEST_OUTPUT_ON_FAILURE: 1
-        run : ctest -C ${{ matrix.configuration }} -j 1 -V
+        run : ctest -C ${{ matrix.configuration }} -j 1 -V
diff --git a/cmake/mariadb.cmake b/cmake/mariadb.cmake
@@ -14,11 +14,11 @@ IF (WIN32)
   FIND_PATH(MARIADB_INCLUDE_DIR mysql.h
     $ENV{PROGRAMFILES}/MariaDB*/include
     $ENV{SYSTEMDRIVE}/MariaDB*/include)
-ELSE (WIN32)
+ELSE ()
   FIND_PATH(MARIADB_INCLUDE_DIR mysql.h
     /usr/local/include/mariadb
     /usr/include/mariadb)
-ENDIF(WIN32)
+ENDIF()
 
 SET(MARIADB_NAMES mariadb)
 IF (WIN32)
@@ -27,13 +27,13 @@ IF (WIN32)
     PATHS $ENV{PROGRAMFILES}/MariaDB*/lib 
     $ENV{SYSTEMDRIVE}/MariaDB*/lib
     PATH_SUFFIXES mariadb)
-ELSE (WIN32)
+ELSE ()
   FIND_LIBRARY(MARIADB_LIBRARY
     NAMES ${MARIADB_NAMES}
     PATHS /usr/lib 
     /usr/local/lib
     PATH_SUFFIXES mariadb)
-ENDIF(WIN32)
+ENDIF()
 
 IF (MARIADB_INCLUDE_DIR AND MARIADB_LIBRARY)
   SET(MARIADB_FOUND TRUE)

diff --git a/cmake/mysql.cmake b/cmake/mysql.cmake
@@ -14,14 +14,17 @@ IF (WIN32)
   FIND_PATH(MYSQL_INCLUDE_DIR mysql.h
     $ENV{PROGRAMFILES}/MySQL/*/include
     $ENV{SYSTEMDRIVE}/MySQL/*/include)
-ELSE (WIN32)
+ELSEIF (LINUX)
   FIND_PATH(MYSQL_INCLUDE_DIR mysql.h
-    /usr/local/Cellar/[email protected]/*/include/mysql
-    /opt/homebrew/opt/[email protected]/include
-    /opt/homebrew/include/mysql
     /usr/local/include/mysql
     /usr/include/mysql)
-ENDIF(WIN32)
+ELSEIF (APPLE)
+  FIND_PATH(MYSQL_INCLUDE_DIR mysql.h
+  /opt/homebrew/include/mysql
+  /opt/homebrew/opt/[email protected]/include
+  /usr/local/Cellar/[email protected]/*/include/mysql
+  /opt/homebrew/Cellar/[email protected]/*/include/mysql)
+ENDIF()
 
 SET(MYSQL_NAMES mysqlclient)
 IF (WIN32)
@@ -30,16 +33,20 @@ IF (WIN32)
     PATHS $ENV{PROGRAMFILES}/MySQL/*/lib 
     $ENV{SYSTEMDRIVE}/MySQL/*/lib
     PATH_SUFFIXES mysql)
-ELSE (WIN32)
+ELSEIF (LINUX)
   FIND_LIBRARY(MYSQL_LIBRARY
     NAMES ${MYSQL_NAMES}
     PATHS /usr/lib 
     /usr/local/lib
-    /opt/homebrew/lib
+    PATH_SUFFIXES mysql)
+ELSEIF (APPLE)
+  FIND_LIBRARY(MYSQL_LIBRARY
+    NAMES ${MYSQL_NAMES}
+    PATHS /opt/homebrew/lib
     /opt/homebrew/opt/[email protected]/lib
-    /usr/local/Cellar/[email protected]/*/lib
+    /opt/homebrew/Cellar/[email protected]/*/lib
     PATH_SUFFIXES mysql)
-ENDIF(WIN32)
+ENDIF()
 
 IF (MYSQL_INCLUDE_DIR AND MYSQL_LIBRARY)
   SET(MYSQL_FOUND TRUE)

diff --git a/cmake/pgsql.cmake b/cmake/pgsql.cmake
@@ -14,27 +14,27 @@ IF (WIN32)
   FIND_PATH(PGSQL_INCLUDE_DIR libpq-fe.h
     $ENV{PROGRAMFILES}/PostgreSQL/*/include
     $ENV{SYSTEMDRIVE}/PostgreSQL/*/include)
-ELSE (WIN32)
+ELSE ()
   FIND_PATH(PGSQL_INCLUDE_DIR libpq-fe.h
     /opt/homebrew/include/postgresql
     /usr/local/include/postgresql
     /usr/include/postgresql)
-ENDIF(WIN32)
+ENDIF()
 
 IF (WIN32)
   SET(PGSQL_NAMES libpq)
   FIND_LIBRARY(PGSQL_LIBRARY
     NAMES ${PGSQL_NAMES}
     PATHS $ENV{PROGRAMFILES}/PostgreSQL/*/lib 
     $ENV{SYSTEMDRIVE}/PostgreSQL/*/lib)
-ELSE (WIN32)
+ELSE ()
   SET(PGSQL_NAMES pq)
   FIND_LIBRARY(PGSQL_LIBRARY
     NAMES ${PGSQL_NAMES}
     PATHS /usr/lib 
     /usr/local/lib
     /opt/homebrew/lib)
-ENDIF(WIN32)
+ENDIF()
 
 IF (PGSQL_INCLUDE_DIR AND PGSQL_LIBRARY)
   SET(PGSQL_FOUND TRUE)