diff --git a/.github/workflows/linux-gxx-build.yml b/.github/workflows/linux-gxx-build.yml index 0b6aea977..6932bd6e2 100644 --- a/.github/workflows/linux-gxx-build.yml +++ b/.github/workflows/linux-gxx-build.yml @@ -4,7 +4,6 @@ on: push: branches: - 'main' - - 'feature/external-deps' workflow_dispatch: pull_request: diff --git a/CMakeLists.txt b/CMakeLists.txt index 371e2ae9a..891ef5f6c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,14 +15,6 @@ if (NOT USE_SYSTEM_DEPENDENCIES) HAS_STD_FORMAT) endif() -if (MSVC) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /permissive- /bigobj") -else () - set(CMAKE_CXX_FLAGS - "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -Wconversion -Wformat -Werror" - ) -endif () - set(LIBRARY_NAME faker-cxx) set(FAKER_SOURCES @@ -117,6 +109,11 @@ target_include_directories( $) target_compile_features(${LIBRARY_NAME} PUBLIC cxx_std_20) +if (MSVC) + target_compile_options(${LIBRARY_NAME} PRIVATE /permissive- /bigobj) +else () + target_compile_options(${LIBRARY_NAME} PRIVATE -Wall -Wextra -Wpedantic -Wconversion -Wformat -Werror) +endif () install(TARGETS ${LIBRARY_NAME} EXPORT ${LIBRARY_NAME}-targets