Return to patch-CMakeLists_txt CVS log

Up to [local] / mystuff-openscad / cad / openscad / patches

Annotation of mystuff-openscad/cad/openscad/patches/patch-CMakeLists_txt, Revision 1.4

1.1       afresh1     1: Index: CMakeLists.txt
                      2: --- CMakeLists.txt.orig
                      3: +++ CMakeLists.txt
1.4     ! afresh1     4: @@ -396,7 +396,7 @@ else()
        !             5:    target_link_libraries(OpenSCAD PRIVATE Eigen3::Eigen)
        !             6:    message(STATUS "Eigen: ${Eigen3_VERSION}")
1.3       afresh1     7:
                      8: -  find_package(Boost 1.70 REQUIRED QUIET COMPONENTS regex program_options)
                      9: +  find_package(Boost 1.70 REQUIRED QUIET COMPONENTS filesystem regex program_options)
                     10:    message(STATUS "Boost: ${Boost_VERSION}")
                     11:    target_include_directories(OpenSCAD SYSTEM PRIVATE ${Boost_INCLUDE_DIRS})
                     12:    target_link_libraries(OpenSCAD PRIVATE ${Boost_LIBRARIES})
1.4     ! afresh1    13: @@ -559,7 +559,7 @@ if(ENABLE_CAIRO STREQUAL "AUTO")
        !            14:    if(CAIRO_VERSION OR CAIRO_FOUND)
        !            15:      message(STATUS "Cairo: ${CAIRO_VERSION}")
        !            16:      target_include_directories(OpenSCAD SYSTEM PRIVATE ${CAIRO_INCLUDE_DIRS})
        !            17: -    target_link_libraries(OpenSCAD PRIVATE ${CAIRO_LIBRARIES})
        !            18: +    target_link_libraries(OpenSCAD PRIVATE ${CAIRO_LINK_LIBRARIES})
        !            19:      target_compile_definitions(OpenSCAD PRIVATE ENABLE_CAIRO)
        !            20:    else()
        !            21:      message(STATUS "Cairo: disabled (not found)")
        !            22: @@ -806,7 +806,7 @@ elseif(UNIX)
1.1       afresh1    23:        if (NOT USE_GLAD)
                     24:          target_compile_definitions(OpenSCAD PRIVATE GLEW_EGL)
                     25:        endif()
                     26: -      target_link_libraries(OpenSCAD PRIVATE OpenGL::EGL)
                     27: +      target_link_libraries(OpenSCAD PRIVATE ${OPENGL_egl_LIBRARY})
                     28:      endif()
                     29:      if(ENABLE_GLX AND OpenGL_GLX_FOUND)
                     30:        target_compile_definitions(OpenSCAD PRIVATE ENABLE_GLX)
1.4     ! afresh1    31: @@ -1121,11 +1121,6 @@ else()
1.1       afresh1    32:      ${GLEW_SOURCES})
                     33:  endif()
                     34:
                     35: -
                     36: -if(UNIX AND (NOT APPLE) AND (NOT HEADLESS))
                     37: -  set(PLATFORM_INPUT_DRIVER_SOURCES src/gui/input/JoystickInputDriver.cc)
                     38: -  target_compile_definitions(OpenSCAD PRIVATE ENABLE_JOYSTICK)
                     39: -endif()
                     40:
                     41:  set(INPUT_DRIVER_SOURCES
                     42:    ${PLATFORM_INPUT_DRIVER_SOURCES}