From 84a07f733cef4f9422492921f9eccf947c09b7b1 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Thu, 3 Dec 2020 09:13:54 +0100
Subject: [PATCH] cpack: rm outdated comments
---
Core/Simulation/ISimulation.cpp | 2 ++
cmake/BornAgain/PackDebian.cmake | 4 ----
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/Core/Simulation/ISimulation.cpp b/Core/Simulation/ISimulation.cpp
index f3b1c5021b8..3ebd2fd7eea 100644
--- a/Core/Simulation/ISimulation.cpp
+++ b/Core/Simulation/ISimulation.cpp
@@ -198,6 +198,7 @@ void ISimulation::runSimulation() {
return;
std::unique_ptr<ParameterPool> param_pool(createParameterTree());
+ std::cout << "DEBUG #par_combi = " << param_combinations << std::endl;
for (size_t index = 0; index < param_combinations; ++index) {
double weight = m_distribution_handler.setParameterValues(param_pool.get(), index);
runSingleSimulation(batch_start, batch_size, weight);
@@ -252,6 +253,7 @@ void ISimulation::addParameterDistribution(const std::string& param_name,
}
void ISimulation::addParameterDistribution(const ParameterDistribution& par_distr) {
+ std::cout << "DEBUG ISimulation::addParameterDistribution" << std::endl;
validateParametrization(par_distr);
m_distribution_handler.addParameterDistribution(par_distr);
}
diff --git a/cmake/BornAgain/PackDebian.cmake b/cmake/BornAgain/PackDebian.cmake
index 87db9ff4d47..1d8f3df5482 100644
--- a/cmake/BornAgain/PackDebian.cmake
+++ b/cmake/BornAgain/PackDebian.cmake
@@ -24,10 +24,6 @@ set(CPACK_DEBIAN_PACKAGE_PRIORITY optional)
set(CPACK_DEBIAN_PACKAGE_SECTION devel)
set(CPACK_STRIP_FILES TRUE)
-#From the BornAgain webpage: set(CPACK_DEBIAN_PACKAGE_DEPENDS "build-essential, git, cmake(>=3.1), libgsl-dev(>=1.15), libboost-all-dev(>=1.48), libfftw3-dev(>=3.3.1), python3, python3-dev, python3-numpy, python3-matplotlib, libtiff5-dev(>=4.0.2), qt5-default(>=5.4), libqt5designercomponents5, qttools5-dev, libqt5svg5-dev")
-
-#Version Specific Dependencies: set(CPACK_DEBIAN_PACKAGE_DEPENDS "libgsl-dev(>=1.15), libboost-program-options${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}, libboost-iostreams${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}, libboost-regex${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}, libfftw3-3(>=3.3.1), python3, python3-numpy, python3-matplotlib, libqt5widgets5(>=5.4), libtiffxx5(>=4.0.2)")
-
#Version-free dependencies:
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libgsl-dev(>=1.15), libboost-all-dev, libfftw3-3(>=3.3.1), python3, python3-numpy, python3-matplotlib, libqt5widgets5(>=5.4), libtiffxx5(>=4.0.2)")
--
GitLab