Merge pull request #211 from ess-dmsc/issue_184

Issue 184
ess-dmsc · May 5, 2019 · 88f646c · 88f646c
2 parents c286b7e + 8c277d7
commit 88f646c
Show file tree

Hide file tree

Showing 18 changed files with 57 additions and 52 deletions.
diff --git a/cmake/BuildInfo.cmake b/cmake/BuildInfo.cmake
@@ -27,30 +27,19 @@ string(TIMESTAMP UTC_TIMESTAMP UTC)
 set(SYSTEM "${CMAKE_SYSTEM}")
 set(PROCESSOR "${CMAKE_SYSTEM_PROCESSOR}")
 
-message(STATUS "BuildInfo.GIT_BRANCH = ${GIT_BRANCH}")
-message(STATUS "BuildInfo.GIT_SHA1 = ${GIT_SHA1}")
-message(STATUS "BuildInfo.GIT_HASH = ${GIT_HASH}")
-message(STATUS "BuildInfo.HOSTNAME = ${HOSTNAME}")
-message(STATUS "BuildInfo.USERNAME = ${USERNAME}")
-message(STATUS "BuildInfo.UTC_TIMESTAMP = ${UTC_TIMESTAMP}")
-message(STATUS "BuildInfo.SYSTEM = ${SYSTEM}")
-message(STATUS "BuildInfo.PROCESSOR = ${PROCESSOR}")
-
 add_definitions(-DBI_GIT_BRANCH="${GIT_BRANCH}")
 add_definitions(-DBI_GIT_SHA1="${GIT_SHA1}")
 add_definitions(-DBI_GIT_HASH="${GIT_HASH}")
 add_definitions(-DBI_HOSTNAME="${HOSTNAME}")
 add_definitions(-DBI_USERNAME="${USERNAME}")
-add_definitions(-DBI_UTC_TIMESTAMP="${UTC_TIMESTAMP}")
+add_definitions(-DBI_CMAKE_TIME="${UTC_TIMESTAMP}")
 add_definitions(-DBI_SYSTEM="${SYSTEM}")
 add_definitions(-DBI_PROCESSOR="${PROCESSOR}")
 
 file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/build_info)
 file(WRITE ${CMAKE_BINARY_DIR}/build_info/build_time.cmake "STRING(TIMESTAMP TIMEZ UTC)\n")
-file(APPEND ${CMAKE_BINARY_DIR}/build_info/build_time.cmake "FILE(WRITE ${CMAKE_BINARY_DIR}/build_info/build_time.h \"#ifndef BUILD_TIME_H\\n\")\n")
-file(APPEND ${CMAKE_BINARY_DIR}/build_info/build_time.cmake "FILE(APPEND ${CMAKE_BINARY_DIR}/build_info/build_time.h \"#define BUILD_TIME_H\\n\\n\")\n")
-file(APPEND ${CMAKE_BINARY_DIR}/build_info/build_time.cmake "FILE(APPEND ${CMAKE_BINARY_DIR}/build_info/build_time.h \"#define BUILD_TIME \\\"\${TIMEZ}\\\"\\n\\n\")\n")
-file(APPEND ${CMAKE_BINARY_DIR}/build_info/build_time.cmake "FILE(APPEND ${CMAKE_BINARY_DIR}/build_info/build_time.h \"#endif // BUILD_TIME_H\\n\")\n")
+file(APPEND ${CMAKE_BINARY_DIR}/build_info/build_time.cmake "FILE(WRITE ${CMAKE_BINARY_DIR}/build_info/build_time.h \"#pragma once\\n\")\n")
+file(APPEND ${CMAKE_BINARY_DIR}/build_info/build_time.cmake "FILE(APPEND ${CMAKE_BINARY_DIR}/build_info/build_time.h \"#define BI_BUILD_TIME \\\"\${TIMEZ}\\\"\\n\\n\")\n")
 add_custom_target(
   build_time
   COMMAND ${CMAKE_COMMAND} -P ${CMAKE_BINARY_DIR}/build_info/build_time.cmake

diff --git a/conanfile.txt b/conanfile.txt
@@ -29,3 +29,5 @@ lib, *.dll -> ./bin
 lib, *.so.* -> ./lib
 lib, *.so -> ./lib
 share, * -> ./share
+filesystem/lib, *.so* -> ./lib
+system/lib, *.so* -> ./lib
diff --git a/source/cmd/main.cpp b/source/cmd/main.cpp
@@ -10,7 +10,10 @@
 #include <core/util/json_file.h>
 
 #include <signal.h>
-#include <build_time.h>
+
+#ifdef BUILD_TIME
+#include "build_time.h"
+#endif
 
 using namespace DAQuiri;
 
@@ -62,7 +65,10 @@ int main(int argc, char** argv)
   INFO("BuildInfo.git_hash: {}", BI_GIT_HASH);
   INFO("BuildInfo.user@host: {}@{}", BI_USERNAME, BI_HOSTNAME);
   INFO("BuildInfo.system: {} {}", BI_SYSTEM, BI_PROCESSOR);
-  INFO("BuildInfo.build_time: {}", BUILD_TIME);
+  INFO("BuildInfo.cmake_time: {}", BI_CMAKE_TIME);
+#ifdef BUILD_TIME
+  INFO("BuildInfo.build_time: {}", BI_BUILD_TIME);
+#endif
 
   auto& engine = Engine::singleton();
 

diff --git a/source/consumers/consumers_autoreg.cpp b/source/consumers/consumers_autoreg.cpp
@@ -1,23 +1,23 @@
 #include <core/consumer_factory.h>
 
-#include "consumers_autoreg.h"
+#include <consumers/consumers_autoreg.h>
 
-#include "stats_scalar.h"
+#include <consumers/stats_scalar.h>
 
-#include "histogram_1d.h"
-#include "prebinned_1d.h"
-#include "tof_1d.h"
-#include "tof_1d_correlate.h"
-#include "time_domain.h"
-#include "time_delta_1d.h"
+#include <consumers/histogram_1d.h>
+#include <consumers/prebinned_1d.h>
+#include <consumers/tof_1d.h>
+#include <consumers/tof_1d_correlate.h>
+#include <consumers/time_domain.h>
+#include <consumers/time_delta_1d.h>
 
-#include "tof_val_2d.h"
-#include "tof_val_2d_correlate.h"
-#include "histogram_2d.h"
-#include "image_2d.h"
-#include "spectrum_time.h"
+#include <consumers/tof_val_2d.h>
+#include <consumers/tof_val_2d_correlate.h>
+#include <consumers/histogram_2d.h>
+#include <consumers/image_2d.h>
+#include <consumers/spectrum_time.h>
 
-#include "histogram_3d.h"
+#include <consumers/histogram_3d.h>
 
 using namespace DAQuiri;
 

diff --git a/source/core/CMakeLists.txt b/source/core/CMakeLists.txt
@@ -67,4 +67,9 @@ target_link_libraries(
 
 enable_coverage(${this_target})
 
-ADD_DEPENDENCIES(${this_target} build_time)
+# this will affect what version metadata gets saved to file in project.cpp
+option(BI "Update build info at compile time" ON)
+if(${BI})
+  add_dependencies(${this_target} build_time)
+  add_definitions(-DBUILD_TIME="TRUE")
+endif()
diff --git a/source/core/plugin/plugin.h b/source/core/plugin/plugin.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "setting.h"
+#include <core/plugin/setting.h>
 
 namespace DAQuiri {
 

diff --git a/source/core/project.cpp b/source/core/project.cpp
@@ -4,8 +4,9 @@
 #include <core/util/h5json.h>
 #include <core/util/ascii_tree.h>
 
-#include <build_time.h>
-
+#ifdef BUILD_TIME
+#include "build_time.h"
+#endif
 
 namespace DAQuiri {
 
@@ -247,7 +248,10 @@ void Project::save(std::string file_name)
     f.attributes.create_from("host", std::string(BI_HOSTNAME));
     f.attributes.create_from("system", std::string(BI_SYSTEM));
     f.attributes.create_from("processor", std::string(BI_PROCESSOR));
-    f.attributes.create_from("build_time", std::string(BUILD_TIME));
+    f.attributes.create_from("cmake_time", std::string(BI_CMAKE_TIME));
+#ifdef BUILD_TIME
+    f.attributes.create_from("build_time", std::string(BI_BUILD_TIME));
+#endif
 
     auto group = f.create_group("project");
 

diff --git a/source/gui/CMakeLists.txt b/source/gui/CMakeLists.txt
@@ -7,9 +7,6 @@ find_package(qplot REQUIRED)
 #OpenGL for plots
 #add_definitions(-DQCUSTOMPLOT_USE_OPENGL=1)
 
-
-#find package for QtColorWidgets
-
 set(${this_target}_sources
   ${dir}/daquiri.cpp
   ${dir}/main.cpp
@@ -34,17 +31,18 @@ set(${this_target}_headers
   ${dir}/UnitConverter.h
   )
 
-set(CMAKE_AUTOUIC ON)
 set(${this_target}_ui
   ${dir}/ProfilesForm.ui
   ${dir}/SettingsForm.ui
   )
 
+add_subdirectory(widgets)
+add_subdirectory(daq)
+
 qt5_add_resources(${this_target}_resources
   ${dir}/resources/daquiri.qrc)
 
-add_subdirectory(widgets)
-add_subdirectory(daq)
+set(CMAKE_AUTOUIC ON)
 
 add_executable(
   ${this_target}
@@ -57,7 +55,6 @@ add_executable(
 target_include_directories(
   ${this_target}
   PRIVATE ${PROJECT_SOURCE_DIR}/source
-  PRIVATE ${${this_target}_include_dirs}
 )
 
 target_link_libraries(

diff --git a/source/gui/ProfilesForm.cpp b/source/gui/ProfilesForm.cpp
@@ -1,5 +1,5 @@
 #include <gui/ProfilesForm.h>
-#include "ui_ProfilesForm.h"
+#include <daquiri_autogen/include/ui_ProfilesForm.h>
 
 #include <gui/Profiles.h>
 #include <gui/widgets/qt_util.h>

diff --git a/source/gui/SettingsForm.cpp b/source/gui/SettingsForm.cpp
@@ -1,5 +1,5 @@
 #include <gui/SettingsForm.h>
-#include "ui_SettingsForm.h"
+#include <daquiri_autogen/include/ui_SettingsForm.h>
 
 #include <gui/ProfilesForm.h>
 #include <gui/Profiles.h>

diff --git a/source/gui/daq/ConsumerDialog.cpp b/source/gui/daq/ConsumerDialog.cpp
@@ -1,5 +1,6 @@
 #include <gui/daq/ConsumerDialog.h>
-#include "ui_ConsumerDialog.h"
+#include <daquiri_autogen/include/ui_ConsumerDialog.h>
+
 #include <core/util/logger.h>
 #include <QInputDialog>
 #include <QMessageBox>

diff --git a/source/gui/daq/ConsumerTemplatesForm.cpp b/source/gui/daq/ConsumerTemplatesForm.cpp
@@ -1,5 +1,5 @@
 #include <gui/daq/ConsumerTemplatesForm.h>
-#include "ui_ConsumerTemplatesForm.h"
+#include <daquiri_autogen/include/ui_ConsumerTemplatesForm.h>
 
 #include <gui/daq/ConsumerDialog.h>
 #include <QFileDialog>

diff --git a/source/gui/daq/ListModeForm.cpp b/source/gui/daq/ListModeForm.cpp
@@ -1,5 +1,5 @@
 #include <gui/daq/ListModeForm.h>
-#include "ui_ListModeForm.h"
+#include <daquiri_autogen/include/ui_ListModeForm.h>
 
 #include <gui/widgets/qt_util.h>
 #include <core/util/lexical_extensions.h>

diff --git a/source/gui/daq/ProjectForm.cpp b/source/gui/daq/ProjectForm.cpp
@@ -1,5 +1,5 @@
 #include <gui/daq/ProjectForm.h>
-#include "ui_ProjectForm.h"
+#include <daquiri_autogen/include/ui_ProjectForm.h>
 
 #include <gui/Profiles.h>
 #include <gui/widgets/QFileExtensions.h>

diff --git a/source/gui/daq/ProjectView.cpp b/source/gui/daq/ProjectView.cpp
@@ -1,5 +1,5 @@
 #include <gui/daq/ProjectView.h>
-#include "ui_ProjectView.h"
+#include <daquiri_autogen/include/ui_ProjectView.h>
 
 #include <gui/daq/ConsumerScalar.h>
 #include <gui/daq/Consumer1D.h>

diff --git a/source/gui/daquiri.cpp b/source/gui/daquiri.cpp
@@ -1,5 +1,5 @@
 #include <gui/daquiri.h>
-#include "ui_daquiri.h"
+#include <daquiri_autogen/include/ui_daquiri.h>
 
 #include <gui/Profiles.h>
 #include <gui/daq/ListModeForm.h>

diff --git a/source/gui/widgets/TimeDurationWidget.cpp b/source/gui/widgets/TimeDurationWidget.cpp
@@ -1,5 +1,6 @@
 #include <gui/widgets/TimeDurationWidget.h>
-#include "ui_TimeDurationWidget.h"
+#include <daquiri_autogen/include/ui_TimeDurationWidget.h>
+
 #include <date/date.h>
 
 #include <core/util/logger.h>

diff --git a/tests/gui/CMakeLists.txt b/tests/gui/CMakeLists.txt
@@ -5,7 +5,7 @@ set(dir ${CMAKE_CURRENT_SOURCE_DIR})
 include(QtLibraryConfig)
 
 add_executable(
-  ${this_target}
+  ${this_target} EXCLUDE_FROM_ALL
   QTimeExtensions.cpp
   ../../source/gui/widgets/QTimeExtensions.cpp
 )