diff --git a/CMakeLists.txt b/CMakeLists.txt index d2c0a098c86f22b3b9335cee4eea0ecd9bdbcfcd..68d8d62fb1273fbad0212fe46c4d2f64366bd733 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -147,22 +147,6 @@ endif() set(CMAKE_INSTALL_PKGINCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}/ug") -# create and install pkg-config information and -# cmake package configuration as ug not dune-uggrid -set(prefix ${CMAKE_INSTALL_PREFIX}) -set(exec_prefix "\${prefix}") -set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}") -set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") -if(UG_ENABLE_PARALLEL) - set(parallel "yes") -else() - set(parallel "no") -endif() -set(VERSION ${DUNE_UGGRID_VERSION}) -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) - add_subdirectory(dune) add_subdirectory(cmake/modules) # set variable names for config.h @@ -173,11 +157,3 @@ set(dune-uggrid_INIT "set(UG_PARALLEL ${parallel}) set(UG_FOR_DUNE yes)") finalize_dune_project(GENERATE_CONFIG_H_CMAKE) - -# This comes after finalize as it uses DUNE_INSTALL_LIBDIR -# computed there. -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libug.pc - DESTINATION ${DUNE_INSTALL_LIBDIR}/pkgconfig) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ug-config.cmake - ${CMAKE_CURRENT_BINARY_DIR}/ug-config-version.cmake - DESTINATION ${DUNE_INSTALL_LIBDIR}/cmake/ug) diff --git a/libug.pc.in b/libug.pc.in deleted file mode 100644 index b9dbd22339d1aa192876ccb7c70aca612b5125cf..0000000000000000000000000000000000000000 --- a/libug.pc.in +++ /dev/null @@ -1,13 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ -parallel=@parallel@ -fordune=yes - -Name: libug -Version: @VERSION@ -Description: library for the discretization of PDEs on unstructured grids -Requires: -Libs: -L${libdir} -ldevS -Cflags: -I${includedir} @UG_EXTRAFLAGS@ diff --git a/ug-config-version.cmake.in b/ug-config-version.cmake.in deleted file mode 100644 index dc96006134cdc70986ac79e174c43a542731b4f0..0000000000000000000000000000000000000000 --- a/ug-config-version.cmake.in +++ /dev/null @@ -1,11 +0,0 @@ -set(PACKAGE_VERSION "@VERSION@") - -# Check whether the requested PACKAGE_FIND_VERSION is compatible -if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}") - set(PACKAGE_VERSION_COMPATIBLE FALSE) -else() - set(PACKAGE_VERSION_COMPATIBLE TRUE) - if ("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}") - set(PACKAGE_VERSION_EXACT TRUE) - endif() -endif() \ No newline at end of file diff --git a/ug-config.cmake.in b/ug-config.cmake.in deleted file mode 100644 index a45cb6f1b122b6b8378375ea40026342246cb581..0000000000000000000000000000000000000000 --- a/ug-config.cmake.in +++ /dev/null @@ -1,10 +0,0 @@ -set(prefix @prefix@) -set(exec_prefix @exec_prefix@) -set(libdir @libdir@) -set(includedir @includedir@) -set(UG_PARALLEL @parallel@) -set(UG_FOR_DUNE yes) -set(UG_LIBRARIES -ldevS) -set(UG_LIBRARY_FLAGS -L${libdir}) -set(UG_INCLUDES ${includedir}) -set(UG_COMPILE_FLAGS @UG_EXTRAFLAGS@)