From a9ec034aa10ba406165bbe1720daf34ff199fd75 Mon Sep 17 00:00:00 2001
From: Simon Praetorius <simon.praetorius@tu-dresden.de>
Date: Tue, 8 Nov 2016 00:36:04 +0100
Subject: [PATCH] prepared for source build and upload

---
 AMDiS/cmake/enable_petsc.cmake              | 3 ++-
 AMDiS/cmake3/target_enable_petsc.cmake      | 3 ++-
 CHANGELOG                                   | 2 +-
 tools/packaging/debian/control.in           | 4 ++--
 tools/packaging/debian/create_package.cmake | 1 +
 tools/packaging/debian/rules.in             | 2 ++
 6 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/AMDiS/cmake/enable_petsc.cmake b/AMDiS/cmake/enable_petsc.cmake
index 49c5b42c..974c073d 100644
--- a/AMDiS/cmake/enable_petsc.cmake
+++ b/AMDiS/cmake/enable_petsc.cmake
@@ -61,7 +61,8 @@ macro(enable_petsc _FLAGS_ _INC_DIRS_ _LIBS_)
 
     # if not valid, search again
     if (NOT PETSC_VALID)
-      find_package(PETSc REQUIRED)
+      message(WARNING "  ---> pkg-config of PETSc is broken!")
+      find_package(PETSc REQUIRED CXX)
       set(PETSC_INCLUDE_DIRS ${PETSC_INCLUDES})
       set(PETSC_LIBRARY_DIRS ${PETSC_LIB_DIR})
       message(STATUS "  Found PETSc, version ${PETSC_VERSION}")
diff --git a/AMDiS/cmake3/target_enable_petsc.cmake b/AMDiS/cmake3/target_enable_petsc.cmake
index 1aba50e9..0591bc2b 100644
--- a/AMDiS/cmake3/target_enable_petsc.cmake
+++ b/AMDiS/cmake3/target_enable_petsc.cmake
@@ -61,7 +61,8 @@ macro(target_enable_petsc _TARGET_ _SCOPE_)
 
     # if not valid, search again
     if (NOT PETSC_VALID)
-      find_package(PETSc REQUIRED)
+      message(WARNING "  ---> pkg-config of PETSc is broken!")
+      find_package(PETSc REQUIRED CXX)
       set(PETSC_INCLUDE_DIRS ${PETSC_INCLUDES})
       set(PETSC_LIBRARY_DIRS ${PETSC_LIB_DIR})
       message(STATUS "  Found PETSc, version ${PETSC_VERSION}")
diff --git a/CHANGELOG b/CHANGELOG
index d7e23789..9c5870d8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-amdis (1.1~rc1-1) UNRELEASED; urgency=medium
+amdis (1.1~rc1-1) xenial; urgency=medium
 
   * CMake configuration redesigned
   * ARH3 reader corrected to parse .parh files correctly
diff --git a/tools/packaging/debian/control.in b/tools/packaging/debian/control.in
index 3595c529..edcb02f9 100644
--- a/tools/packaging/debian/control.in
+++ b/tools/packaging/debian/control.in
@@ -9,14 +9,14 @@ Build-Depends: debhelper (>= 9), libboost-date-time-dev (>= 1.48),
  libboost-filesystem-dev (>= 1.48), libboost-iostreams-dev (>= 1.48),
  libboost-program-options-dev (>= 1.48), libboost-system-dev (>= 1.48),
  zlib1g-dev (>= 1.2), libsuitesparse-dev (>= 4.2.1), cmake (>= 2.8.10),
- petsc-dev (>= 3.3), libparmetis-dev (>= 3.0)
+ petsc-dev (>= 3.3), libparmetis-dev (>= 3.0), pkg-config (>= 0.26)
 
 Package: libamdis-dev
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libboost-date-time-dev (>= 1.48),
  libboost-filesystem-dev (>= 1.48), libboost-iostreams-dev (>= 1.48),
  libboost-program-options-dev (>= 1.48), libboost-system-dev (>= 1.48),
- zlib1g-dev (>= 1.2), cmake (>= 2.8.10)
+ zlib1g-dev (>= 1.2), cmake (>= 2.8.10), pkg-config (>= 0.26)
 Recommends: libamdis (= @PACKAGE_VERSION@), libamdis-par (= @PACKAGE_VERSION@)
 Suggests: libamdis-debug (= @PACKAGE_VERSION@), libamdis-par-debug (= @PACKAGE_VERSION@)
 Description: @PACKAGE_DESCRIPTION_SUMMARY@
diff --git a/tools/packaging/debian/create_package.cmake b/tools/packaging/debian/create_package.cmake
index e5ac4979..45e49247 100644
--- a/tools/packaging/debian/create_package.cmake
+++ b/tools/packaging/debian/create_package.cmake
@@ -67,5 +67,6 @@ file(WRITE ${DEBIAN_DIR}/compat "9\n")
 file(WRITE ${DEBIAN_DIR}/soure/format "3.0 (quilt)\n")
 
 # generate the debian package
+# execute_process(COMMAND debuild -S -sa
 execute_process(COMMAND debuild -d -us -uc
                 WORKING_DIRECTORY ${OUT_DIR}/${PACKAGE_PREFIX})
diff --git a/tools/packaging/debian/rules.in b/tools/packaging/debian/rules.in
index 8747b7df..30111240 100644
--- a/tools/packaging/debian/rules.in
+++ b/tools/packaging/debian/rules.in
@@ -18,11 +18,13 @@ override_dh_auto_configure:
 		-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 \
-- 
GitLab