diff --git a/AMDiS/cmake/enable_petsc.cmake b/AMDiS/cmake/enable_petsc.cmake index 49c5b42cb5f9eb800ca6681e05b64d3b2887ecb0..974c073df02ad22172ed0e9063cffb6020c19d85 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 1aba50e9c2143af613df5c6e2998addbd0773dd8..0591bc2b117127ab7e50c3184e22224203161687 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 d7e23789671c227173aa1c668434b6c6bbeca5a5..9c5870d80c0e22ec64d4efd3984cea95ef0f34fd 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 3595c529462fe41709749a5efe2c95e65bcd9849..edcb02f9fc2c7379e524af450c49c5236c6b8b8e 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 e5ac49790ca7ad87e9b26f1d81028613a439d4ab..45e4924740a20a8596f133a69b023fd1940e3044 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 8747b7df123a194a811deb62dda50f10808efc0a..3011124002f6b7c0380ab5adeb16ccab26b75abf 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 \