Skip to content
Snippets Groups Projects
Commit 9b8f8a02 authored by Oliver Sander's avatar Oliver Sander
Browse files

Merge branch 'feature/remove-x11-checks' into 'master'

[cmake] Remove checks for X11 (xlib)



See merge request !27
parents b8cd54bf d80e24c7
No related branches found
No related tags found
1 merge request!27[cmake] Remove checks for X11 (xlib)
Pipeline #
......@@ -164,7 +164,6 @@ else()
endif()
set(fordune "yes")
set(VERSION ${DUNE_UGGRID_VERSION})
set(UG_XLIBS "${X11_LIBRARIES}")
configure_file(libug.pc.in libug.pc)
configure_file(ug-config.cmake.in ug-config.cmake @ONLY)
configure_file(ug-config-version.cmake.in ug-config-version.cmake @ONLY)
......
find_package(X11)
# Compatibility against previous UG versions.
set(UG_USE_SYSTEM_HEAP ${UG_ENABLE_SYSTEM_HEAP})
set(UG_FOUND True)
......
......@@ -9,5 +9,5 @@ Name: libug
Version: @VERSION@
Description: library for the discretization of PDEs on unstructured grids
Requires:
Libs: -L${libdir} -ldevS @UG_XLIBS@
Libs: -L${libdir} -ldevS
Cflags: -I${includedir} @UG_EXTRAFLAGS@
......@@ -9,5 +9,5 @@ Name: libug
Version: @VERSION@
Description: library for the discretization of PDEs on unstructured grids
Requires:
Libs: -L${libdir} -ldevS @UG_XLIBS@
Libs: -L${libdir} -ldevS
Cflags: -I${includedir} @UG_EXTRAFLAGS@
......@@ -4,8 +4,7 @@ set(libdir @libdir@)
set(includedir @includedir@)
set(UG_PARALLEL @parallel@)
set(UG_FOR_DUNE @fordune@)
set(UG_LIBRARIES -ldevS @UG_XLIBS@)
set(UG_LIBRARIES -ldevS)
set(UG_LIBRARY_FLAGS -L${libdir})
set(UG_INCLUDES ${includedir})
set(UG_COMPILE_FLAGS @UG_EXTRAFLAGS@)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment