Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
laggykiller committed Sep 9, 2023
1 parent 07fa8f1 commit a654791
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 38 deletions.
26 changes: 0 additions & 26 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,103 +20,77 @@ jobs:
submodules_mode: true
cibw_archs_windows: AMD64
cibw_environment: APNGASM_COMPILE_TARGET=x86_64
cibw_before_all: prepare-win.bat
- os: windows-2019
submodules_mode: true
cibw_archs_windows: x86
cibw_environment: APNGASM_COMPILE_TARGET=x86
cibw_before_all: prepare-win.bat
- os: windows-2019
submodules_mode: true
cibw_archs_windows: ARM64
cibw_environment: APNGASM_COMPILE_TARGET=armv8
cibw_before_all: prepare-win.bat
- os: macos-11
submodules_mode: true
cibw_archs_macos: x86_64
cibw_environment: >
APNGASM_COMPILE_TARGET=x64
_PYTHON_HOST_PLATFORM=macosx-10.15-x86_64
VCPKG_OSX_DEPLOYMENT_TARGET=10.15
MACOSX_DEPLOYMENT_TARGET=10.15
CMAKE_OSX_DEPLOYMENT_TARGET=10.15
VCPKG_C_FLAGS="-mmacosx-version-min=10.15"
VCPKG_CXX_FLAGS="-mmacosx-version-min=10.15"
cibw_before_all: ./prepare-mac.sh
- os: macos-11
submodules_mode: true
cibw_archs_macos: arm64
cibw_environment: >
APNGASM_COMPILE_TARGET=armv8
_PYTHON_HOST_PLATFORM=macosx-11.0-arm64
VCPKG_OSX_DEPLOYMENT_TARGET=11.0
MACOSX_DEPLOYMENT_TARGET=11.0
CMAKE_OSX_DEPLOYMENT_TARGET=11.0
VCPKG_C_FLAGS="-mmacosx-version-min=11.0"
VCPKG_CXX_FLAGS="-mmacosx-version-min=11.0"
cibw_before_all: ./prepare-mac.sh
- os: macos-11
submodules_mode: true
cibw_archs_macos: universal2
cibw_environment: >
APNGASM_COMPILE_TARGET=universal2
_PYTHON_HOST_PLATFORM=macosx-11.0-universal2
VCPKG_OSX_DEPLOYMENT_TARGET=11.0
MACOSX_DEPLOYMENT_TARGET=11.0
CMAKE_OSX_DEPLOYMENT_TARGET=11.0
VCPKG_C_FLAGS="-mmacosx-version-min=11.0"
VCPKG_CXX_FLAGS="-mmacosx-version-min=11.0"
- os: ubuntu-20.04
submodules_mode: true
cibw_archs_linux: x86_64
cibw_before_all: ./prepare-linux.sh
cibw_environment: APNGASM_COMPILE_TARGET=x86_64
- os: ubuntu-20.04
submodules_mode: true
cibw_archs_linux: i686
cibw_before_all: ./prepare-linux.sh
cibw_environment: APNGASM_COMPILE_TARGET=x86
- os: ubuntu-20.04
submodules_mode: true
cibw_archs_linux: aarch64
cibw_skip: "*-muslinux_* pp*"
cibw_before_all: ./prepare-linux.sh
cibw_environment: APNGASM_COMPILE_TARGET=armv8
- os: ubuntu-20.04
submodules_mode: true
cibw_archs_linux: aarch64
cibw_skip: "*-multilinux_* pp*"
cibw_before_all: ./prepare-linux.sh
cibw_environment: APNGASM_COMPILE_TARGET=armv8
- os: ubuntu-20.04
submodules_mode: true
cibw_archs_linux: aarch64
cibw_skip: "*-muslinux_* *-multilinux_*"
cibw_before_all: ./prepare-linux.sh
cibw_environment: APNGASM_COMPILE_TARGET=armv8
- os: ubuntu-20.04
submodules_mode: true
cibw_archs_linux: ppc64le
cibw_skip: "*-muslinux_*"
cibw_before_all: ./prepare-linux.sh
cibw_environment: APNGASM_COMPILE_TARGET=ppc64le
- os: ubuntu-20.04
submodules_mode: true
cibw_archs_linux: ppc64le
cibw_skip: "*-multilinux_*"
cibw_before_all: ./prepare-linux.sh
cibw_environment: APNGASM_COMPILE_TARGET=ppc64le
- os: ubuntu-20.04
submodules_mode: true
cibw_archs_linux: s390x
cibw_skip: "*-muslinux_*"
cibw_before_all: ./prepare-linux.sh
cibw_environment: APNGASM_COMPILE_TARGET=s390x
- os: ubuntu-20.04
submodules_mode: true
cibw_archs_linux: s390x
cibw_skip: "*-multilinux_*"
cibw_before_all: ./prepare-linux.sh
cibw_environment: APNGASM_COMPILE_TARGET=s390x

steps:
Expand Down
24 changes: 14 additions & 10 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,16 +1,6 @@
cmake_minimum_required(VERSION 3.17)
cmake_policy(SET CMP0074 NEW)

if (WIN32)
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
elseif (LINUX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
elseif (APPLE)
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15")
endif()

find_package(PythonInterp 3 REQUIRED)

set(PREPARE_CMD ${PYTHON_EXECUTABLE} "${CMAKE_SOURCE_DIR}/get-deps.py")
Expand All @@ -24,6 +14,20 @@ execute_process(
message(STATUS "Finished get-deps.py")
message(STATUS "APNGASM_COMPILE_TARGET is ${APNGASM_COMPILE_TARGET}")

if (WIN32)
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
elseif (LINUX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
elseif (APPLE)
if(${APNGASM_COMPILE_TARGET} STREQUAL "x86_64")
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15")
else()
set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0")
endif()
endif()

set(ZLIB_USE_STATIC_LIBS ON)
set(PNG_USE_STATIC_LIBS ON)
set(Boost_USE_STATIC_LIBS ON)
Expand Down
7 changes: 5 additions & 2 deletions get-deps.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@ def install_deps(arch=None):
elif platform.system() == 'Darwin':
settings.append('os=Macos')
settings.append('compiler=apple-clang')
settings.append('compiler.version=11.0')
if arch == 'armv8':
settings.append('compiler.version=11.0')
else:
settings.append('compiler.version=10.15')
settings.append('compiler.libcxx=libc++')
elif platform.system() == 'Linux':
settings.append('os=Linux')
Expand Down Expand Up @@ -90,7 +93,7 @@ def install_deps(arch=None):
cmake_presets = cmake_presets.replace('armv8', 'universal2')
with open(os.path.join(conan_output_universal2, 'CMakePresets.json'), 'w+') as f:
f.write(cmake_presets)

with open(os.path.join(conan_output_universal2, 'conan_toolchain.cmake')) as f:
conan_toolchain = f.read()
conan_toolchain = conan_toolchain.replace('armv8', 'universal2')
Expand Down

0 comments on commit a654791

Please sign in to comment.