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.1.1.1

1.1       afresh1     1: Index: CMakeLists.txt
                      2: --- CMakeLists.txt.orig
                      3: +++ CMakeLists.txt
                      4: @@ -527,7 +527,7 @@ if(ENABLE_CAIRO)
                      5:      if (CAIRO_VERSION)
                      6:        message(STATUS "Cairo: ${CAIRO_VERSION}")
                      7:        target_include_directories(OpenSCAD SYSTEM PRIVATE ${CAIRO_INCLUDE_DIRS})
                      8: -      target_link_libraries(OpenSCAD PRIVATE ${CAIRO_LIBRARIES})
                      9: +      target_link_libraries(OpenSCAD PRIVATE ${CAIRO_LINK_LIBRARIES})
                     10:        target_compile_definitions(OpenSCAD PRIVATE ENABLE_CAIRO)
                     11:      else()
                     12:        message(STATUS "Cairo: disabled")
                     13: @@ -645,6 +645,7 @@ if(NOT HEADLESS)
                     14:    else()
                     15:      find_package(Qt5 5.12 COMPONENTS Core Widgets Multimedia OpenGL Concurrent Network Svg ${QT_TEST_IF_ANY} REQUIRED QUIET)
                     16:      message(STATUS "Qt5: ${Qt5_VERSION}")
                     17: +    #target_link_libraries(OpenSCAD PRIVATE Qt5::Core Qt5::Widgets Qt5::Multimedia Qt5::OpenGL Qt5::Concurrent Qt5::Network Qt5::Svg )
                     18:
                     19:      if (Qt5_POSITION_INDEPENDENT_CODE)
                     20:        set_property(TARGET OpenSCAD PROPERTY POSITION_INDEPENDENT_CODE ON)
                     21: @@ -749,7 +750,7 @@ elseif(UNIX)
                     22:        if (NOT USE_GLAD)
                     23:          target_compile_definitions(OpenSCAD PRIVATE GLEW_EGL)
                     24:        endif()
                     25: -      target_link_libraries(OpenSCAD PRIVATE OpenGL::EGL)
                     26: +      target_link_libraries(OpenSCAD PRIVATE ${OPENGL_egl_LIBRARY})
                     27:      endif()
                     28:      if(ENABLE_GLX AND OpenGL_GLX_FOUND)
                     29:        target_compile_definitions(OpenSCAD PRIVATE ENABLE_GLX)
                     30: @@ -1064,11 +1065,6 @@ else()
                     31:      ${GLEW_SOURCES})
                     32:  endif()
                     33:
                     34: -
                     35: -if(UNIX AND (NOT APPLE) AND (NOT HEADLESS))
                     36: -  set(PLATFORM_INPUT_DRIVER_SOURCES src/gui/input/JoystickInputDriver.cc)
                     37: -  target_compile_definitions(OpenSCAD PRIVATE ENABLE_JOYSTICK)
                     38: -endif()
                     39:
                     40:  set(INPUT_DRIVER_SOURCES
                     41:    ${PLATFORM_INPUT_DRIVER_SOURCES}