Skip to content

Commit

Permalink
Idk, let's see if this dependency installation trick works.
Browse files Browse the repository at this point in the history
  • Loading branch information
mcourteaux committed Oct 26, 2023
1 parent fd28e53 commit 4fa257c
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 6 deletions.
29 changes: 25 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-22.04, ubuntu-20.04, ubuntu-18.04, windows-latest, macos-latest]
#os: [ubuntu-22.04, ubuntu-20.04, windows-latest, macos-latest]
os: [windows-latest]
include:
- os: ubuntu-22.04
outputsuffix: ubuntu-2204
Expand Down Expand Up @@ -48,15 +49,35 @@ jobs:
with:
submodules: recursive

- name: Install vcpkg (Windows)
if: runner.os == 'Windows'
run: |
vcpkg install libjpeg-turbo
- name: Configure CMake
if: runner.os == 'Windows'
# Configure CMake in a 'build' subdirectory.
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE=${{env.VCPKG_INSTALLATION_ROOT}}/scripts/buildsystems/vcpkg.cmake .

- name: Configure CMake
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
if: runner.os != 'Windows'
# Configure CMake in a 'build' subdirectory.
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} .

- name: Build
# Build your program with the given configuration
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}

- name: Cache vcpkg libraries
if: runner.os == 'Windows'
uses: actions/cache@v2
with:
path: |
vcpkg/installed
vcpkg/vcpkg
key: ${{ runner.os }}-vcpkg-${{ hashFiles('**/vcpkg.json') }}


- name: Archive Release
uses: thedoctor0/[email protected]
with:
Expand Down
11 changes: 9 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ target_include_directories(ctpl INTERFACE "lib/ctpl/")
set(JSON_MultipleHeaders ON CACHE BOOL "" FORCE)
add_subdirectory(lib/json)

find_package(JPEG REQUIRED)

set(CMAKE_SKIP_BUILD_RPATH FALSE)
set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
Expand All @@ -56,13 +55,21 @@ target_link_libraries(reproject PUBLIC
OpenEXR::OpenEXR
ctpl
nlohmann_json
JPEG::JPEG
)
set_target_properties(reproject PROPERTIES
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
)


if (WIN32)
set(VCPKG_LIBRARY_LINKAGE static)
find_package(libjpeg-turbo)
target_link_libraries(reproject PUBLIC libjpeg-tubo::turbojpeg-static)
else()
find_package(JPEG)
target_link_libraries(reproject PUBLIC JPEG::JPEG)
endif()


foreach(LIBRARY OpenEXRCore OpenEXR Imath Iex IlmThread)
set_target_properties(${LIBRARY} PROPERTIES
Expand Down

0 comments on commit 4fa257c

Please sign in to comment.