diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b74242a..7d05283 100644 --- 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 index fa1347b..5cca8f2 100644 --- 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 index 4be7447..710ca8c 100644 --- 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)