Skip to content

Commit 2ad32ca

Browse files
committed
Add the 'batch' source files that are used for logging act/shield fit info, to always be built.
1 parent 4a72a7a commit 2ad32ca

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,9 @@ set(sources
350350
src/SimpleActivityCalc.cpp
351351
src/RefLineDynamic.cpp
352352
src/AnalystChecks.cpp
353+
src/BatchPeak.cpp
354+
src/BatchActivity.cpp
355+
src/BatchInfoLog.cpp
353356
js/SpectrumChart.js
354357
js/InterSpec.js
355358
)
@@ -466,6 +469,9 @@ set(headers
466469
InterSpec/SimpleActivityCalc.h
467470
InterSpec/RefLineDynamic.h
468471
InterSpec/AnalystChecks.h
472+
InterSpec/BatchPeak.h
473+
InterSpec/BatchActivity.h
474+
InterSpec/BatchInfoLog.h
469475
)
470476

471477
if(USE_DB_TO_STORE_SPECTRA)
@@ -587,19 +593,13 @@ endif( USE_REL_ACT_TOOL )
587593
if( USE_BATCH_TOOLS )
588594
list( APPEND sources
589595
src/BatchCommandLine.cpp
590-
src/BatchPeak.cpp
591-
src/BatchActivity.cpp
592-
src/BatchInfoLog.cpp
593596
src/BatchGuiWidget.cpp
594597
src/BatchGuiAnaWidget.cpp
595598
src/BatchGuiInputFile.cpp
596599
)
597600

598601
list( APPEND headers
599602
InterSpec/BatchCommandLine.h
600-
InterSpec/BatchPeak.h
601-
InterSpec/BatchActivity.h
602-
InterSpec/BatchInfoLog.h
603603
InterSpec/BatchGuiWidget.h
604604
InterSpec/BatchGuiAnaWidget.h
605605
InterSpec/BatchGuiInputFile.h

target/testing/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ set(PERFORM_DEVELOPER_CHECKS ON CACHE BOOL "")
4545
set(SpecUtils_ENABLE_EQUALITY_CHECKS ON CACHE BOOL "")
4646
set(USE_SPECRUM_FILE_QUERY_WIDGET ON CACHE BOOL "")
4747

48-
set(USE_BATCH_TOOLS ON CACHE INTERNAL "")
48+
set(USE_BATCH_TOOLS OFF CACHE INTERNAL "")
4949

5050
set(TEST_SUITE_BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/test_data"
5151
CACHE STRING

0 commit comments

Comments
 (0)