Skip to content
GitLab
Commit a9ec034a authored by Praetorius, Simon's avatar Praetorius, Simon
Browse files

prepared for source build and upload

parent 0fccc81b
Hide whitespace changes
Inline Side-by-side
AMDiS/cmake/enable_petsc.cmake
View file @ a9ec034a
...@@ -61,7 +61,8 @@ macro(enable_petsc _FLAGS_ _INC_DIRS_ _LIBS_) ...@@ -61,7 +61,8 @@ macro(enable_petsc _FLAGS_ _INC_DIRS_ _LIBS_)
# if not valid, search again # if not valid, search again
if (NOT PETSC_VALID) 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_INCLUDE_DIRS ${PETSC_INCLUDES})
set(PETSC_LIBRARY_DIRS ${PETSC_LIB_DIR}) set(PETSC_LIBRARY_DIRS ${PETSC_LIB_DIR})
message(STATUS " Found PETSc, version ${PETSC_VERSION}") message(STATUS " Found PETSc, version ${PETSC_VERSION}")
......
AMDiS/cmake3/target_enable_petsc.cmake
View file @ a9ec034a
...@@ -61,7 +61,8 @@ macro(target_enable_petsc _TARGET_ _SCOPE_) ...@@ -61,7 +61,8 @@ macro(target_enable_petsc _TARGET_ _SCOPE_)
# if not valid, search again # if not valid, search again
if (NOT PETSC_VALID) 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_INCLUDE_DIRS ${PETSC_INCLUDES})
set(PETSC_LIBRARY_DIRS ${PETSC_LIB_DIR}) set(PETSC_LIBRARY_DIRS ${PETSC_LIB_DIR})
message(STATUS " Found PETSc, version ${PETSC_VERSION}") message(STATUS " Found PETSc, version ${PETSC_VERSION}")
......
CHANGELOG
View file @ a9ec034a
amdis (1.1~rc1-1) UNRELEASED; urgency=medium amdis (1.1~rc1-1) xenial; urgency=medium
* CMake configuration redesigned * CMake configuration redesigned
* ARH3 reader corrected to parse .parh files correctly * ARH3 reader corrected to parse .parh files correctly
......
tools/packaging/debian/control.in
View file @ a9ec034a
...@@ -9,14 +9,14 @@ Build-Depends: debhelper (>= 9), libboost-date-time-dev (>= 1.48), ...@@ -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-filesystem-dev (>= 1.48), libboost-iostreams-dev (>= 1.48),
libboost-program-options-dev (>= 1.48), libboost-system-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), 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 Package: libamdis-dev
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libboost-date-time-dev (>= 1.48), Depends: ${shlibs:Depends}, ${misc:Depends}, libboost-date-time-dev (>= 1.48),
libboost-filesystem-dev (>= 1.48), libboost-iostreams-dev (>= 1.48), libboost-filesystem-dev (>= 1.48), libboost-iostreams-dev (>= 1.48),
libboost-program-options-dev (>= 1.48), libboost-system-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@) Recommends: libamdis (= @PACKAGE_VERSION@), libamdis-par (= @PACKAGE_VERSION@)
Suggests: libamdis-debug (= @PACKAGE_VERSION@), libamdis-par-debug (= @PACKAGE_VERSION@) Suggests: libamdis-debug (= @PACKAGE_VERSION@), libamdis-par-debug (= @PACKAGE_VERSION@)
Description: @PACKAGE_DESCRIPTION_SUMMARY@ Description: @PACKAGE_DESCRIPTION_SUMMARY@
......
tools/packaging/debian/create_package.cmake
View file @ a9ec034a
...@@ -67,5 +67,6 @@ file(WRITE ${DEBIAN_DIR}/compat "9\n") ...@@ -67,5 +67,6 @@ file(WRITE ${DEBIAN_DIR}/compat "9\n")
file(WRITE ${DEBIAN_DIR}/soure/format "3.0 (quilt)\n") file(WRITE ${DEBIAN_DIR}/soure/format "3.0 (quilt)\n")
# generate the debian package # generate the debian package
# execute_process(COMMAND debuild -S -sa
execute_process(COMMAND debuild -d -us -uc execute_process(COMMAND debuild -d -us -uc
WORKING_DIRECTORY ${OUT_DIR}/${PACKAGE_PREFIX}) WORKING_DIRECTORY ${OUT_DIR}/${PACKAGE_PREFIX})
tools/packaging/debian/rules.in
View file @ a9ec034a
...@@ -18,11 +18,13 @@ override_dh_auto_configure: ...@@ -18,11 +18,13 @@ override_dh_auto_configure:
-DENABLE_PARALLEL_DOMAIN:BOOL=ON -DENABLE_PARALLEL_DOMAIN:BOOL=ON
dh_auto_configure -Scmake -DAMDiS --builddirectory=build_libamdis_debug --package=libamdis-debug -- \ dh_auto_configure -Scmake -DAMDiS --builddirectory=build_libamdis_debug --package=libamdis-debug -- \
-DCMAKE_BUILD_TYPE=Debug \
-DENABLE_EXTENSIONS:BOOL=ON \ -DENABLE_EXTENSIONS:BOOL=ON \
-DENABLE_COMPRESSION:BOOL=ON \ -DENABLE_COMPRESSION:BOOL=ON \
-DENABLE_UMFPACK:BOOL=ON -DENABLE_UMFPACK:BOOL=ON
dh_auto_configure -Scmake -DAMDiS --builddirectory=build_libamdis_par_debug --package=libamdis-par-debug -- \ dh_auto_configure -Scmake -DAMDiS --builddirectory=build_libamdis_par_debug --package=libamdis-par-debug -- \
-DCMAKE_BUILD_TYPE=Debug \
-DENABLE_EXTENSIONS:BOOL=ON \ -DENABLE_EXTENSIONS:BOOL=ON \
-DENABLE_COMPRESSION:BOOL=ON \ -DENABLE_COMPRESSION:BOOL=ON \
-DENABLE_UMFPACK:BOOL=OFF \ -DENABLE_UMFPACK:BOOL=OFF \
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment