=================================================================== RCS file: /cvs/mystuff-openscad/cad/openscad/patches/patch-CMakeLists_txt,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mystuff-openscad/cad/openscad/patches/patch-CMakeLists_txt 2025/09/24 05:09:16 1.3 +++ mystuff-openscad/cad/openscad/patches/patch-CMakeLists_txt 2025/10/16 04:31:42 1.4 @@ -1,25 +1,25 @@ Index: CMakeLists.txt --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -388,7 +388,7 @@ else() - target_compile_definitions(OpenSCAD PRIVATE EIGEN_DONT_ALIGN) - message(STATUS "Eigen: ${EIGEN3_VERSION}") +@@ -396,7 +396,7 @@ else() + target_link_libraries(OpenSCAD PRIVATE Eigen3::Eigen) + message(STATUS "Eigen: ${Eigen3_VERSION}") - find_package(Boost 1.70 REQUIRED QUIET COMPONENTS regex program_options) + find_package(Boost 1.70 REQUIRED QUIET COMPONENTS filesystem regex program_options) message(STATUS "Boost: ${Boost_VERSION}") target_include_directories(OpenSCAD SYSTEM PRIVATE ${Boost_INCLUDE_DIRS}) target_link_libraries(OpenSCAD PRIVATE ${Boost_LIBRARIES}) -@@ -527,7 +527,7 @@ if(ENABLE_CAIRO) - if (CAIRO_VERSION) - message(STATUS "Cairo: ${CAIRO_VERSION}") - target_include_directories(OpenSCAD SYSTEM PRIVATE ${CAIRO_INCLUDE_DIRS}) -- target_link_libraries(OpenSCAD PRIVATE ${CAIRO_LIBRARIES}) -+ target_link_libraries(OpenSCAD PRIVATE ${CAIRO_LINK_LIBRARIES}) - target_compile_definitions(OpenSCAD PRIVATE ENABLE_CAIRO) - else() - message(STATUS "Cairo: disabled") -@@ -749,7 +749,7 @@ elseif(UNIX) +@@ -559,7 +559,7 @@ if(ENABLE_CAIRO STREQUAL "AUTO") + if(CAIRO_VERSION OR CAIRO_FOUND) + message(STATUS "Cairo: ${CAIRO_VERSION}") + target_include_directories(OpenSCAD SYSTEM PRIVATE ${CAIRO_INCLUDE_DIRS}) +- target_link_libraries(OpenSCAD PRIVATE ${CAIRO_LIBRARIES}) ++ target_link_libraries(OpenSCAD PRIVATE ${CAIRO_LINK_LIBRARIES}) + target_compile_definitions(OpenSCAD PRIVATE ENABLE_CAIRO) + else() + message(STATUS "Cairo: disabled (not found)") +@@ -806,7 +806,7 @@ elseif(UNIX) if (NOT USE_GLAD) target_compile_definitions(OpenSCAD PRIVATE GLEW_EGL) endif() @@ -28,7 +28,7 @@ endif() if(ENABLE_GLX AND OpenGL_GLX_FOUND) target_compile_definitions(OpenSCAD PRIVATE ENABLE_GLX) -@@ -1064,11 +1064,6 @@ else() +@@ -1121,11 +1121,6 @@ else() ${GLEW_SOURCES}) endif()