rboullard
02d1a0a13a
Conan Packaging / Package assimp/6.0.5 (push) Failing after 0s
Conan Packaging / Package cli11/2.6.2 (push) Failing after 0s
Conan Packaging / Package eabase/01082025 (push) Failing after 0s
Conan Packaging / Package flatbuffers/25.12.19-2026-02-06-03fffb2-bigfoot (push) Failing after 0s
Conan Packaging / Package glm/1.0.3 (push) Failing after 0s
Conan Packaging / Package imgui/1.92.8-docking (push) Failing after 1s
Conan Packaging / Package lodepng/cci.20260210 (push) Failing after 0s
Conan Packaging / Package meshoptimizer/1.2 (push) Failing after 0s
Conan Packaging / Package rapidhash/3.0 (push) Failing after 0s
Conan Packaging / Package spirv-cross/1.4.341.0 (push) Failing after 1s
Conan Packaging / Package spirv-headers/1.4.341.0 (push) Failing after 0s
Conan Packaging / Package unordered_dense/4.8.1 (push) Failing after 0s
Conan Packaging / Package spirv-tools/1.4.341.0 (push) Skipped
Conan Packaging / Package mimalloc/3.3.2 (push) Failing after 0s
Conan Packaging / Package mold/2.41.0 (push) Failing after 0s
Conan Packaging / Package pixelmatch-cpp17/1.0.3 (push) Failing after 0s
Conan Packaging / Package sqlite3/3.53.3 (push) Failing after 0s
Conan Packaging / Package stduuid/1.2.3 (push) Failing after 0s
Conan Packaging / Package vulkan-headers/1.4.341.0 (push) Failing after 0s
Conan Packaging / Package eastl/3.27.01 (push) Skipped
Conan Packaging / Package vulkan-memory-allocator/3.3.0 (push) Skipped
Conan Packaging / Package vulkan-utility-libraries/1.4.341.0 (push) Skipped
Conan Packaging / Package glslang/1.4.341.0 (push) Skipped
Conan Packaging / Package vulkan-validationlayers/1.4.341.0 (push) Skipped
Conan Packaging / Package shaderc/2026.1 (push) Skipped
62 lines
2.4 KiB
Diff
62 lines
2.4 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index f4ed9a7..a5b6a69 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -6,14 +6,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
|
|
|
option(PIXELMATCH_BUILD_TESTS "Enable building tests" OFF)
|
|
|
|
-# stb libraries for tests and image_utils. Not used in pixelmatch-cpp17 itself.
|
|
-add_library(pixelmatch_third_party_stb_image STATIC third_party/stb/stb_image.cpp)
|
|
-target_include_directories(pixelmatch_third_party_stb_image PUBLIC third_party)
|
|
-target_compile_options(pixelmatch_third_party_stb_image PRIVATE -Wno-unused-function -Wno-self-assign)
|
|
-
|
|
-add_library(pixelmatch_third_party_stb_image_write STATIC third_party/stb/stb_image_write.cpp)
|
|
-target_include_directories(pixelmatch_third_party_stb_image_write PUBLIC third_party)
|
|
-target_compile_options(pixelmatch_third_party_stb_image_write PRIVATE -Wno-unused-function -Wno-self-assign)
|
|
+find_package(stb)
|
|
|
|
# Main library
|
|
add_library(pixelmatch-cpp17 src/pixelmatch/pixelmatch.cc)
|
|
@@ -22,16 +15,18 @@ target_include_directories(pixelmatch-cpp17 PUBLIC src)
|
|
# image_utils helper library (uses stb to load and save images)
|
|
add_library(image_utils src/pixelmatch/image_utils.cc)
|
|
target_include_directories(image_utils PUBLIC src)
|
|
-target_link_libraries(image_utils PUBLIC pixelmatch-cpp17 pixelmatch_third_party_stb_image pixelmatch_third_party_stb_image_write)
|
|
+target_link_libraries(image_utils PUBLIC pixelmatch-cpp17 stb::stb)
|
|
+
|
|
+install(FILES src/pixelmatch/pixelmatch.h DESTINATION include/pixelmatch)
|
|
+install(TARGETS pixelmatch-cpp17 DESTINATION lib)
|
|
+
|
|
+if ((MSVC) AND (MSVC_VERSION GREATER_EQUAL 1914))
|
|
+ target_compile_options(${PROJECT_NAME} PRIVATE "/Zc:preprocessor")
|
|
+ target_compile_options(${PROJECT_NAME} PRIVATE "/Zc:__cplusplus")
|
|
+endif()
|
|
|
|
if(PIXELMATCH_BUILD_TESTS)
|
|
-include(FetchContent)
|
|
-FetchContent_Declare(
|
|
- googletest
|
|
- URL https://github.com/google/googletest/archive/refs/tags/v1.14.0.zip
|
|
-)
|
|
-set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
|
|
-FetchContent_MakeAvailable(googletest)
|
|
+find_package(GTest)
|
|
|
|
enable_testing()
|
|
add_library(test_base INTERFACE)
|
|
diff --git a/src/pixelmatch/image_utils.cc b/src/pixelmatch/image_utils.cc
|
|
index 74ec434..068e75d 100644
|
|
--- a/src/pixelmatch/image_utils.cc
|
|
+++ b/src/pixelmatch/image_utils.cc
|
|
@@ -1,7 +1,7 @@
|
|
#include "pixelmatch/image_utils.h"
|
|
|
|
-#include <stb/stb_image.h>
|
|
-#include <stb/stb_image_write.h>
|
|
+#include <stb_image.h>
|
|
+#include <stb_image_write.h>
|
|
|
|
#include <cassert>
|
|
#include <cstring> // For memcmp.
|