Skip to content

Commit

Permalink
Move the fmt lib dep to PRIVATE (#1439)
Browse files Browse the repository at this point in the history
* Move the fmt lib dep to PRIVATE

- restore the fully msvc test build
- restore the arm64ec release build
  • Loading branch information
baconpaul authored Oct 29, 2024
1 parent 44bd56e commit 7943fa7
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 14 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
strategy:
matrix:
include:
- name: "windows msvc (core subset)"
- name: "windows msvc"
os: windows-latest
target: scxt-core
cmakeConfig: -A x64
target: shortcircuit-products
cmakeConfig: -G"Visual Studio 17 2022" -A x64
runTests: false
clapValidate: false

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ jobs:
name: windows-x86
cmakeArgs: -GNinja -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang

#- os: windows-latest
# name: windows-arm64ec
# cmakeArgs: -G"Visual Studio 17 2022" -A arm64ec -DCMAKE_SYSTEM_VERSION=10
- os: windows-latest
name: windows-arm64ec
cmakeArgs: -G"Visual Studio 17 2022" -A arm64ec -DCMAKE_SYSTEM_VERSION=10

- os: macos-latest
name: macos
Expand Down
5 changes: 4 additions & 1 deletion clients/clap-first/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ add_library(${IMPL_TARGET} STATIC
scxt-plugin/scxt-clap-entry-impl.cpp
)

target_link_libraries(${IMPL_TARGET} PRIVATE fmt)

target_link_libraries(${IMPL_TARGET} PUBLIC
clap_juce_shim_headers
scxt-core
Expand Down Expand Up @@ -90,12 +92,13 @@ else()
set_target_properties(${SA_TARGET} PROPERTIES
OUTPUT_NAME ${name})
target_sources(${SA_TARGET} PRIVATE scxt-juce-standalone/scxt-juce-standalone.cpp)
target_link_libraries(${SA_TARGET} PRIVATE ${IMPL_TARGET} juce::juce_audio_devices juce::juce_audio_utils)
target_link_libraries(${SA_TARGET} PRIVATE ${IMPL_TARGET} fmt juce::juce_audio_devices juce::juce_audio_utils)
target_compile_definitions(${SA_TARGET} PRIVATE
JUCE_ALSA=$<IF:$<BOOL:${SCXT_USE_ALSA}>,1,0>
JUCE_JACK=$<IF:$<BOOL:${SCXT_USE_JACK}>,1,0>
JUCE_USE_FLAC=0)
set_target_properties(${SA_TARGET} PROPERTIES UNITY_BUILD FALSE)

endif()

set(ALL_TARGET ${PROJECT_NAME}_all)
Expand Down
11 changes: 6 additions & 5 deletions src-ui/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,15 @@ cmrc_add_resource_library(scxtui_json_layouts
set_target_properties(scxtui_json_layouts PROPERTIES UNITY_BUILD FALSE)


target_link_libraries(${PROJECT_NAME} PRIVATE
fmt
sst-plugininfra::strnatcmp
scxt-resources
scxtui_json_layouts
)
target_link_libraries(${PROJECT_NAME} PUBLIC
scxt-core
scxt-resources
sst-jucegui

sst-plugininfra::strnatcmp

scxtui_json_layouts
)

if (NOT CMAKE_UNITY_BUILD)
Expand Down
3 changes: 1 addition & 2 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,8 @@ else ()
endif ()

target_include_directories(${PROJECT_NAME} PUBLIC .)
target_link_libraries(${PROJECT_NAME} PRIVATE fmt)
target_link_libraries(${PROJECT_NAME} PUBLIC
fmt

eurorack

sst-cpputils
Expand Down
1 change: 1 addition & 0 deletions tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ add_executable(scxt-test
sample_analytics.cpp)

target_link_libraries(scxt-test
fmt
scxt-core
shortcircuit::catch2
)
Expand Down

0 comments on commit 7943fa7

Please sign in to comment.