Skip to content

Commit

Permalink
Test building on Windows with new libxml2.
Browse files Browse the repository at this point in the history
  • Loading branch information
hsorby committed Oct 29, 2024
1 parent 4ca2048 commit 48da3b1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
2 changes: 2 additions & 0 deletions cmake/TestLibXml2ConstErrorStructuredErrorCallback.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ function(Test_LibXml2_Const_Error_Structured_Error_Callback)
cmake_minimum_required(VERSION 3.18.0)
project(undefined CXX)
add_library(foo SHARED \"foo.cpp\")
message(STATUS \"CMAKE_PREFIX_PATH=\${CMAKE_PREFIX_PATH}\")
")
if(HAVE_LIBXML2_CONFIG)
file(TO_CMAKE_PATH "${LibXml2_DIR}" _SAFE_LibXml2_DIR)
Expand All @@ -40,6 +41,7 @@ target_link_libraries(foo PUBLIC ${LIBXML2_TARGET_NAME})
else()
file(APPEND "${_TEST_PROJECT_DIR}/CMakeLists.txt"
"
message(STATUS \"Not using the configuration file ...\")
find_package(LibXml2)
target_include_directories(foo PUBLIC ${LIBXML2_INCLUDE_DIR})
target_link_libraries(foo PUBLIC ${LIBXML2_LIBRARIES})
Expand Down
1 change: 1 addition & 0 deletions cmake/environmentchecks.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ if(LibXml2_FOUND)
endif()
endforeach()
else()
message(STATUS "CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}")
find_package(LibXml2 REQUIRED)
set(_LibXml2_FIND_REPORTED TRUE CACHE INTERNAL "Flag for reporting on what LibXml2 was found.")
if(TARGET z)
Expand Down

0 comments on commit 48da3b1

Please sign in to comment.