From e3ec702dc5c4d48126ad08a47671a8dc05310701 Mon Sep 17 00:00:00 2001 From: "S.V. Paulauskas" Date: Thu, 2 Mar 2017 16:00:06 -0500 Subject: [PATCH 1/3] adding build directories to ignore --- .gitignore | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 113cc58..763c6af 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,8 @@ #Build files *.o pixie_ldf_* -build/ -.idea +*build-*/ +.idea/ #Backup files from various editors *.save @@ -36,4 +36,4 @@ HIS LDF HIS/* LDF/* -data +data/ From 08700da93dce3072fe98112044faa0157c77b272 Mon Sep 17 00:00:00 2001 From: "S.V. Paulauskas" Date: Thu, 2 Mar 2017 16:08:17 -0500 Subject: [PATCH 2/3] Removing ide files from tracking. --- ide/pixie_scan.cbp | 383 --------------------------------------------- 1 file changed, 383 deletions(-) delete mode 100644 ide/pixie_scan.cbp diff --git a/ide/pixie_scan.cbp b/ide/pixie_scan.cbp deleted file mode 100644 index b7d9c02..0000000 --- a/ide/pixie_scan.cbp +++ /dev/null @@ -1,383 +0,0 @@ - - - - - - From 901983e131c9f0853fed3c10486056b0d75ee776 Mon Sep 17 00:00:00 2001 From: "S.V. Paulauskas" Date: Thu, 2 Mar 2017 16:12:13 -0500 Subject: [PATCH 3/3] Updating the FindHRIBF.cmake file so that it finds things easier. --- cmakeModules/FindHRIBF.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cmakeModules/FindHRIBF.cmake b/cmakeModules/FindHRIBF.cmake index 1530a7f..6856058 100644 --- a/cmakeModules/FindHRIBF.cmake +++ b/cmakeModules/FindHRIBF.cmake @@ -6,13 +6,13 @@ find_path(UPAK_LIBRARY_DIR NAMES scanorlib.a orphlib.a HINTS $ENV{HHIRF_DIR} - PATHS /usr/hhirf - /opt/hhirf) + PATHS /usr/hhirf /opt/hhirf) + find_path(ACQ2_LIBRARY_DIR NAMES acqlib.a ipclib.a HINTS $ENV{ACQ2_LIBDIR} - PATHS /usr/acq2 - /opt/acq2) + PATHS /usr/acq2 /opt/acq2 /usr/hhirf /opt/hhirf) + # Support the REQUIRED and QUIET arguments. include (FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(HRIBF DEFAULT_MSG @@ -25,4 +25,4 @@ if(HRIBF_FOUND) ${ACQ2_LIBRARY_DIR}/acqlib.a ${ACQ2_LIBRARY_DIR}/ipclib.a) endif(HRIBF_FOUND) -mark_as_advanced(HRIBF_LIBRARIES) \ No newline at end of file +mark_as_advanced(HRIBF_LIBRARIES)