Skip to content

Commit

Permalink
Try fix xcode15 linker fire duplicate libraries warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
halx99 committed Jan 10, 2024
1 parent 86a4aeb commit 749c7c0
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 8 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ jobs:
shell: pwsh
run: ./build.ps1 -p linux -a x64
osx:
runs-on: macos-latest
runs-on: macos-13
strategy:
matrix:
arch:
Expand All @@ -105,6 +105,9 @@ jobs:
- uses: actions/checkout@v3
with:
submodules: 'recursive'
- uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: '15.1'
- name: Build
shell: pwsh
run: ./build.ps1 -p osx -a $env:BUILD_ARCH
Expand Down
2 changes: 1 addition & 1 deletion docs/DevSetup.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
2. Run `pwsh setup.ps1`, restart the console after it has finished for environment variables to take effect
3. Ensure C/C++ compiler toolset installed on your host machine
- Windows: visual studio 2022 with desktop workflow
- macOS: xcode14.2
- macOS: xcode14.2+
- Linux: GCC(G++)

## Creating A New Project
Expand Down
1 change: 0 additions & 1 deletion thirdparty/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,6 @@ if(AX_WITH_CHIPMUNK)
endif()

ax_add_3rd(freetype OPTIONS
"FT_WITH_ZLIB ON"
"DISABLE_FORCE_DEBUG_POSTFIX ON"
"SKIP_INSTALL_ALL TRUE"
"FT_DISABLE_HARFBUZZ TRUE"
Expand Down
3 changes: 3 additions & 0 deletions thirdparty/png/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ add_library(${target_name} STATIC
${libpng_intel_sources}
)

# Avoid cmake builtin FindPNG.cmake add target again
add_library(PNG::PNG ALIAS ${target_name})

target_include_directories(${target_name} PUBLIC "${CMAKE_CURRENT_LIST_DIR}")

if(_PNG_ISA_SIMD)
Expand Down
10 changes: 5 additions & 5 deletions thirdparty/zlib/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@

set(lib_name zlib)
set(target_name ${lib_name})

project(${lib_name})
set(target_name "zlib")
project(${target_name})

_1kfetch_dist(zlib "${PARENT_DIRECTORY}/_deps")

Expand Down Expand Up @@ -30,3 +27,6 @@ endif()
set_target_properties(${target_name} PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${zlib_INC_DIR}"
)

# Avoid cmake builtin FindPNG.cmake add target again
add_library(ZLIB::ZLIB ALIAS zlib)

0 comments on commit 749c7c0

Please # to comment.