jack
/
terravisor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replaced once thought redundant find_package for freeimage

This commit is contained in:
Jack Christensen 2024-08-20 00:53:53 -04:00
parent 2d14a6011d
commit 0a4cf689e5
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitlab-ci.yml
View File

@ -12,9 +12,6 @@ build:
stage: build stage: build
script: script:
# Set the VCPKG_TOOLCHAIN environment variable # Set the VCPKG_TOOLCHAIN environment variable
- ls /vcpkg/installed
- ls /vcpkg/installed/x64-linux
- ls /vcpkg/installed/x64-linux/lib
- export VCPKG_TOOLCHAIN=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake - export VCPKG_TOOLCHAIN=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake
- mkdir -p build - mkdir -p build
- cmake -B build -S . -G Ninja -DCMAKE_TOOLCHAIN_FILE=$VCPKG_TOOLCHAIN - cmake -B build -S . -G Ninja -DCMAKE_TOOLCHAIN_FILE=$VCPKG_TOOLCHAIN

2
CMakeLists.txt
View File

@ -25,7 +25,7 @@ find_package(GLEW CONFIG REQUIRED)
find_package(glfw3 CONFIG REQUIRED) find_package(glfw3 CONFIG REQUIRED)
find_package(glm CONFIG REQUIRED) find_package(glm CONFIG REQUIRED)
find_package(assimp CONFIG REQUIRED) find_package(assimp CONFIG REQUIRED)
#find_package(freeimage REQUIRED) find_package(freeimage REQUIRED)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}")
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}")