gwm17/EventBuilder_Skeleton
1
0
Fork 0
mirror of https://github.com/sesps/EventBuilder_Skeleton.git synced 2025-01-30 09:18:52 -05:00
Code Issues Projects Releases Wiki Activity

Fix bugs related to case sensitivity on Apple for dictionary generation. Fix some bugs based on type mismatch in function declaration/definition

Browse Source
This commit is contained in:
Gordon McCann 2022-06-28 06:02:57 -04:00
parent 0faf562d56
commit cfb08567c0
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/evb/CompassRun.h
View File

@ -23,7 +23,7 @@ namespace EventBuilder {
{ {
public: public:
CompassRun(); CompassRun();
CompassRun(const std::string& dir, uint64_t bsize); CompassRun(const std::string& dir, size_t bsize);
~CompassRun(); ~CompassRun();
inline void SetDirectory(const std::string& dir) { directory = dir; } inline void SetDirectory(const std::string& dir) { directory = dir; }
inline void SetScalerInput(const std::string& filename) { m_scalerinput = filename; } inline void SetScalerInput(const std::string& filename) { m_scalerinput = filename; }

4
src/evb/EVBApp.cpp
View File

@ -27,7 +27,7 @@ namespace EventBuilder {
{ {
} }
void EVBApp::DefaultProgressCallback(long curVal, long totalVal) void EVBApp::DefaultProgressCallback(int64_t curVal, int64_t totalVal)
{ {
double fraction = ((double)curVal)/totalVal; double fraction = ((double)curVal)/totalVal;
EVB_INFO("Percent of run built: {0}", fraction*100); EVB_INFO("Percent of run built: {0}", fraction*100);
@ -212,4 +212,4 @@ namespace EventBuilder {
void EVBApp::SetScalerFile(const std::string& fullpath) { EVB_TRACE("Scaler file set to {0}", fullpath); m_scalerfile = fullpath; } void EVBApp::SetScalerFile(const std::string& fullpath) { EVB_TRACE("Scaler file set to {0}", fullpath); m_scalerfile = fullpath; }
void EVBApp::SetBufferSize(uint64_t bufsize) { EVB_TRACE("Buffer size set to {0} hits", bufsize); m_buffersize = bufsize; } void EVBApp::SetBufferSize(uint64_t bufsize) { EVB_TRACE("Buffer size set to {0} hits", bufsize); m_buffersize = bufsize; }
} }

4
src/evbdict/CMakeLists.txt
View File

@ -1,7 +1,7 @@
add_library(EVBDict SHARED) add_library(EVBDict SHARED)
target_include_directories(EVBDict SYSTEM PUBLIC ${ROOT_INCLUDE_DIRS} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(EVBDict SYSTEM PUBLIC ${ROOT_INCLUDE_DIRS} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
ROOT_GENERATE_DICTIONARY(evbdict DataStructs.h LINKDEF LinkDef_evb.h MODULE EVBDict) ROOT_GENERATE_DICTIONARY(evb_dict DataStructs.h LINKDEF LinkDef_evb.h MODULE EVBDict)
target_sources(EVBDict PRIVATE target_sources(EVBDict PRIVATE
DataStructs.h DataStructs.h
@ -14,4 +14,4 @@ add_custom_command(TARGET EVBDict POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_CURRENT_BINARY_DIR}/libEVBDict_rdict.pcm ${CMAKE_CURRENT_BINARY_DIR}/libEVBDict_rdict.pcm
${EVB_LIBRARY_DIR}/libEVBDict_rdict.pcm ${EVB_LIBRARY_DIR}/libEVBDict_rdict.pcm
) )

4
src/guidict/CMakeLists.txt
View File

@ -1,7 +1,7 @@
add_library(GuiDict SHARED) add_library(GuiDict SHARED)
target_include_directories(GuiDict SYSTEM PUBLIC ../../vendor/spdlog/include/ ${ROOT_INCLUDE_DIRS} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(GuiDict SYSTEM PUBLIC ../../vendor/spdlog/include/ ${ROOT_INCLUDE_DIRS} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
ROOT_GENERATE_DICTIONARY(guidict EVBMainFrame.h FileViewFrame.h LINKDEF LinkDef_Gui.h MODULE GuiDict) ROOT_GENERATE_DICTIONARY(gui_dict EVBMainFrame.h FileViewFrame.h LINKDEF LinkDef_Gui.h MODULE GuiDict)
target_sources(GuiDict PRIVATE target_sources(GuiDict PRIVATE
FileViewFrame.h FileViewFrame.h
@ -20,4 +20,4 @@ add_custom_command(TARGET GuiDict POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_CURRENT_BINARY_DIR}/libGuiDict_rdict.pcm ${CMAKE_CURRENT_BINARY_DIR}/libGuiDict_rdict.pcm
${EVB_LIBRARY_DIR}/libGuiDict_rdict.pcm ${EVB_LIBRARY_DIR}/libGuiDict_rdict.pcm
) )