diff --git a/CMakeLists.txt b/CMakeLists.txt index da3caa6..52b0d4a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,11 +38,11 @@ if(UNIX) set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}) # for multi-config build system (e.g. Xcode, Ninja Multi-Config) - foreach(OUTPUTCONFIG IN LISTS CMAKE_CONFIGURATION_TYPES) - string(TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIG) - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${OUTPUTCONFIG}/${CMAKE_INSTALL_LIBDIR}) - set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${OUTPUTCONFIG}/${CMAKE_INSTALL_LIBDIR}) - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${OUTPUTCONFIG}/${CMAKE_INSTALL_BINDIR}) + foreach(OutputConfig IN LISTS CMAKE_CONFIGURATION_TYPES) + string(TOUPPER ${OutputConfig} OUTPUTCONFIG) + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${OutputConfig}/${CMAKE_INSTALL_LIBDIR}) + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${OutputConfig}/${CMAKE_INSTALL_LIBDIR}) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${OutputConfig}/${CMAKE_INSTALL_BINDIR}) endforeach() else() # Currently Only support static build for windows @@ -51,11 +51,11 @@ else() set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}) # for multi-config builds (e.g. msvc) - foreach(OUTPUTCONFIG IN LISTS CMAKE_CONFIGURATION_TYPES) - string(TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIG) - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${OUTPUTCONFIG}/${CMAKE_INSTALL_BINDIR}) - set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${OUTPUTCONFIG}/${CMAKE_INSTALL_BINDIR}) - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${OUTPUTCONFIG}/${CMAKE_INSTALL_BINDIR}) + foreach(OutputConfig IN LISTS CMAKE_CONFIGURATION_TYPES) + string(TOUPPER ${OutputConfig} OUTPUTCONFIG) + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${OutputConfig}/${CMAKE_INSTALL_BINDIR}) + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${OutputConfig}/${CMAKE_INSTALL_BINDIR}) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${OutputConfig}/${CMAKE_INSTALL_BINDIR}) endforeach() endif() diff --git a/ci/docker/almalinux/Dockerfile b/ci/docker/almalinux/Dockerfile index bc745a4..dd8930e 100644 --- a/ci/docker/almalinux/Dockerfile +++ b/ci/docker/almalinux/Dockerfile @@ -1,6 +1,7 @@ # Create a virtual environment with all tools installed # ref: https://hub.docker.com/_/almalinux FROM almalinux:latest AS env + # Install system build dependencies ENV PATH=/usr/local/bin:$PATH RUN dnf -y update \ diff --git a/ci/docker/alpine/Dockerfile b/ci/docker/alpine/Dockerfile index b803051..d7d2fcb 100644 --- a/ci/docker/alpine/Dockerfile +++ b/ci/docker/alpine/Dockerfile @@ -1,6 +1,7 @@ # Create a virtual environment with all tools installed # ref: https://hub.docker.com/_/alpine FROM alpine:edge AS env + # Install system build dependencies ENV PATH=/usr/local/bin:$PATH RUN apk add --no-cache git build-base linux-headers cmake diff --git a/ci/docker/archlinux/Dockerfile b/ci/docker/archlinux/Dockerfile index 16c5664..6791c44 100644 --- a/ci/docker/archlinux/Dockerfile +++ b/ci/docker/archlinux/Dockerfile @@ -1,6 +1,7 @@ # Create a virtual environment with all tools installed # ref: https://hub.docker.com/_/archlinux/ FROM archlinux:latest AS env + # Install system build dependencies ENV PATH=/usr/local/bin:$PATH RUN pacman -Syu --noconfirm git base-devel cmake diff --git a/ci/docker/debian/Dockerfile b/ci/docker/debian/Dockerfile index 59726b7..62c00f4 100644 --- a/ci/docker/debian/Dockerfile +++ b/ci/docker/debian/Dockerfile @@ -1,6 +1,7 @@ # Create a virtual environment with all tools installed # ref: https://hub.docker.com/_/debian FROM debian:unstable AS env + # Install system build dependencies ENV PATH=/usr/local/bin:$PATH RUN apt-get update -qq \ diff --git a/ci/docker/fedora/Dockerfile b/ci/docker/fedora/Dockerfile index 35f845a..9925eb6 100644 --- a/ci/docker/fedora/Dockerfile +++ b/ci/docker/fedora/Dockerfile @@ -1,6 +1,7 @@ # Create a virtual environment with all tools installed # ref: https://hub.docker.com/_/fedora FROM fedora:latest AS env + # Install system build dependencies ENV PATH=/usr/local/bin:$PATH RUN dnf -y update \ diff --git a/ci/docker/opensuse/Dockerfile b/ci/docker/opensuse/Dockerfile index 5ebcb37..962b31f 100644 --- a/ci/docker/opensuse/Dockerfile +++ b/ci/docker/opensuse/Dockerfile @@ -1,6 +1,7 @@ # Create a virtual environment with all tools installed # ref: https://hub.docker.com/r/opensuse/tumbleweed FROM opensuse/tumbleweed AS env + # Install system build dependencies ENV PATH=/usr/local/bin:$PATH RUN zypper update -y \ diff --git a/ci/docker/ubuntu/Dockerfile b/ci/docker/ubuntu/Dockerfile index f538ceb..5bda1c9 100644 --- a/ci/docker/ubuntu/Dockerfile +++ b/ci/docker/ubuntu/Dockerfile @@ -1,6 +1,7 @@ # Create a virtual environment with all tools installed # ref: https://hub.docker.com/_/ubuntu FROM ubuntu:latest AS env + # Install system build dependencies ENV PATH=/usr/local/bin:$PATH RUN apt update -q \