Merge branch 'macos-build-broken'

jgaa · May 6, 2024 · 40be17d · 40be17d
2 parents 2003f02 + 5294a68
commit 40be17d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 18 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -19,9 +19,7 @@ jobs:
           - os: windows-latest
             compiler: msvc
           - os: macos-latest
-            compiler: gcc
-          # - os: macos-latest
-          #   compiler: clang
+            compiler:
 
     steps:
       - name: Checkout code
@@ -53,6 +51,11 @@ jobs:
           vcpkg: true
           cppcheck: false
 
+      - name: Install compiler for Macos
+        if: startsWith(matrix.os, 'macos')
+        run: |
+          brew install llvm
+
       - name: Prepare the PATH
         run: |
             if [[ "${{ runner.os }}" == "Windows" ]]; then

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -32,16 +32,11 @@ if (MYSQLPOOL_LOGDEP)
     add_dependencies(${PROJECT_NAME} ${MYSQLPOOL_LOGDEP})
 endif()
 
-if(NOT MSVC)
-    set(STANDARD_FS_LIB stdc++fs)
-endif()
-
 target_link_libraries(${PROJECT_NAME}
     ${Boost_LIBRARIES}
     OpenSSL::SSL
     OpenSSL::Crypto
     ZLIB::ZLIB
-    ${STANDARD_FS_LIB}
     ${CMAKE_THREAD_LIBS_INIT}
 )
 

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -45,11 +45,6 @@ target_include_directories(unit_tests
 target_link_libraries(unit_tests
     ${GTEST_LIBRARIES}
     mysqlpool
-    # ${Boost_LIBRARIES}
-    # ${ZLIB_LIBRARIES}
-    # ${OPENSSL_LIBRARIES}
-    # stdc++fs
-    # ${CMAKE_THREAD_LIBS_INIT}
 )
 
 add_test(NAME unit_tests COMMAND unit_tests)
@@ -83,11 +78,6 @@ target_include_directories(integration_tests
 target_link_libraries(integration_tests
     ${GTEST_LIBRARIES}
     mysqlpool
-    # ${Boost_LIBRARIES}
-    # ${ZLIB_LIBRARIES}
-    # ${OPENSSL_LIBRARIES}
-    # stdc++fs
-    # ${CMAKE_THREAD_LIBS_INIT}
 )
 
 add_test(NAME integration_tests COMMAND integration_tests)