From 752e125c91432310071bfe736b8d5f3150d3ac89 Mon Sep 17 00:00:00 2001 From: Jack Christensen Date: Thu, 22 Aug 2024 16:59:53 -0400 Subject: [PATCH] Test FreeImage on Linux --- .gitlab-ci.yml | 7 ------- CMakeLists.txt | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8b613fc..5d56855 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,13 +12,6 @@ build: stage: build script: # Set the VCPKG_TOOLCHAIN environment variable - - ls /vcpkg - - ls /vcpkg/installed/x64-linux - - ls /vcpkg/installed/x64-linux/lib - - ls /vcpkg/installed/x64-linux/include - - ls /vcpkg/packages - - ls /vcpkg/packages/freeimage_x64-linux - - ls /vcpkg/packages/freeimage_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 fa0e923..d8a46f7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ if (WIN32) else() set(VCPKG_ROOT "/vcpkg") set(FreeImage_INCLUDE_DIR ${VCPKG_ROOT}/packages/freeimage_x64-linux/include) - set(FreeImage_LIBRARIES ${VCPKG_ROOT}/packages/freeimage_x64-linux/lib/FreeImage.a) + set(FreeImage_LIBRARIES ${VCPKG_ROOT}/packages/freeimage_x64-linux/lib/libFreeImage.a) endif() #include(C:/users/jmchr/vcpkg/scripts/buildsystems/vcpkg.cmake)