From 0a4cf689e5df896bc7f3fe1c06a59954768fe2af Mon Sep 17 00:00:00 2001 From: Jack Christensen Date: Tue, 20 Aug 2024 00:53:53 -0400 Subject: [PATCH] Replaced once thought redundant find_package for freeimage --- .gitlab-ci.yml | 3 --- CMakeLists.txt | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 976b7e6..5d56855 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,9 +12,6 @@ build: stage: build script: # 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 - mkdir -p build - cmake -B build -S . -G Ninja -DCMAKE_TOOLCHAIN_FILE=$VCPKG_TOOLCHAIN diff --git a/CMakeLists.txt b/CMakeLists.txt index 27e7145..c8ebd1a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,7 +25,7 @@ find_package(GLEW CONFIG REQUIRED) find_package(glfw3 CONFIG REQUIRED) find_package(glm 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_RELEASE "${CMAKE_BINARY_DIR}")