From 0fccc81b522e3562ee4d69fa5ac0d5237a976934 Mon Sep 17 00:00:00 2001 From: Simon Praetorius Date: Mon, 7 Nov 2016 20:20:46 +0100 Subject: [PATCH] debian build files updated --- README.md | 2 +- tools/packaging/debian/CPackOptions.cmake.in | 17 ----------------- tools/packaging/debian/libamdis-dev.examples | 1 + tools/packaging/debian/rules.in | 7 +++---- 4 files changed, 5 insertions(+), 22 deletions(-) delete mode 100644 tools/packaging/debian/CPackOptions.cmake.in create mode 100644 tools/packaging/debian/libamdis-dev.examples diff --git a/README.md b/README.md index c68d586c..6d42e90f 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ cmake --build . --target all The documentation is built using [Doxygen](http://www.doxygen.org). Simply run the command in the `doc` subdirectory: ``` -cd doc +cd AMDiS/doc doxygen ``` diff --git a/tools/packaging/debian/CPackOptions.cmake.in b/tools/packaging/debian/CPackOptions.cmake.in deleted file mode 100644 index 5948da27..00000000 --- a/tools/packaging/debian/CPackOptions.cmake.in +++ /dev/null @@ -1,17 +0,0 @@ -set(CPACK_PACKAGE_NAME "@PACKAGE_SOURCE_NAME@") -set(CPACK_PACKAGE_VERSION "1.1~rc1") -SET(CPACK_PACKAGE_VERSION_MAJOR "1") -SET(CPACK_PACKAGE_VERSION_MINOR "1") -SET(CPACK_PACKAGE_VERSION_PATCH "0") -set(CPACK_PACKAGE_CONTACT "Simon Praetorius ") - -set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "A C++ library to solve a broad class of PDEs using adaptive finite elements.") -set(CPACK_PACKAGE_DESCRIPTION_FILE "@CMAKE_SOURCE_DIR@/README.md") -set(CPACK_PACKAGE_DESCRIPTION "Adaptive MultiDimensional Simulations (AMDiS) is a C++ library - to solve a broad class of partial differential equations (PDEs) using - adaptive finite elements.") - -set(CPACK_RESOURCE_FILE_LICENSE "@CMAKE_SOURCE_DIR@/LICENSE") -set(CPACK_RESOURCE_FILE_README "@CMAKE_SOURCE_DIR@/README.md") - -set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}") diff --git a/tools/packaging/debian/libamdis-dev.examples b/tools/packaging/debian/libamdis-dev.examples new file mode 100644 index 00000000..08a24d5c --- /dev/null +++ b/tools/packaging/debian/libamdis-dev.examples @@ -0,0 +1 @@ +demo/ \ No newline at end of file diff --git a/tools/packaging/debian/rules.in b/tools/packaging/debian/rules.in index fb357c3a..8747b7df 100644 --- a/tools/packaging/debian/rules.in +++ b/tools/packaging/debian/rules.in @@ -5,26 +5,24 @@ override_dh_auto_configure: dh_auto_configure -Scmake -DAMDiS --builddirectory=build_libamdis --package=libamdis -- \ - -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DENABLE_EXTENSIONS:BOOL=ON \ -DENABLE_COMPRESSION:BOOL=ON \ -DENABLE_UMFPACK:BOOL=ON dh_auto_configure -Scmake -DAMDiS --builddirectory=build_libamdis_par --package=libamdis-par -- \ - -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DENABLE_EXTENSIONS:BOOL=ON \ -DENABLE_COMPRESSION:BOOL=ON \ -DENABLE_UMFPACK:BOOL=OFF \ -DENABLE_PARALLEL_DOMAIN:BOOL=ON dh_auto_configure -Scmake -DAMDiS --builddirectory=build_libamdis_debug --package=libamdis-debug -- \ - -DCMAKE_BUILD_TYPE=Debug \ -DENABLE_EXTENSIONS:BOOL=ON \ -DENABLE_COMPRESSION:BOOL=ON \ -DENABLE_UMFPACK:BOOL=ON dh_auto_configure -Scmake -DAMDiS --builddirectory=build_libamdis_par_debug --package=libamdis-par-debug -- \ - -DCMAKE_BUILD_TYPE=Debug \ -DENABLE_EXTENSIONS:BOOL=ON \ -DENABLE_COMPRESSION:BOOL=ON \ -DENABLE_UMFPACK:BOOL=OFF \ @@ -35,6 +33,7 @@ override_dh_auto_build: dh_auto_build --builddirectory=build_libamdis_par --package=libamdis-par --max-parallel=2 dh_auto_build --builddirectory=build_libamdis_debug --package=libamdis-debug --max-parallel=2 dh_auto_build --builddirectory=build_libamdis_par_debug --package=libamdis-par-debug --max-parallel=2 + doxygen AMDiS/doc/Doxyfile override_dh_auto_install: dh_auto_install --builddirectory=build_libamdis --package=libamdis -- GitLab