From 28fb1023fa39ff4112e880e53cbb844de599e730 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Mon, 20 Jul 2020 17:18:59 +0200 Subject: [PATCH] mythen3: rename default pattern txt and move to inst dir --- slsDetectorServers/mythen3DetectorServer/CMakeLists.txt | 2 ++ .../{DefaultPattern.txt => DefaultPattern_mythen3.txt} | 0 slsDetectorServers/mythen3DetectorServer/Makefile | 1 + .../mythen3DetectorServer/slsDetectorServer_defs.h | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) rename slsDetectorServers/mythen3DetectorServer/{DefaultPattern.txt => DefaultPattern_mythen3.txt} (100%) diff --git a/slsDetectorServers/mythen3DetectorServer/CMakeLists.txt b/slsDetectorServers/mythen3DetectorServer/CMakeLists.txt index a5f14667a..85baade80 100644 --- a/slsDetectorServers/mythen3DetectorServer/CMakeLists.txt +++ b/slsDetectorServers/mythen3DetectorServer/CMakeLists.txt @@ -38,3 +38,5 @@ set_target_properties(mythen3DetectorServer_virtual PROPERTIES install(TARGETS mythen3DetectorServer_virtual RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ) + +configure_file(DefaultPattern_mythen3.txt ${CMAKE_BINARY_DIR}/bin/DefaultPattern_mythen3.txt COPYONLY) \ No newline at end of file diff --git a/slsDetectorServers/mythen3DetectorServer/DefaultPattern.txt b/slsDetectorServers/mythen3DetectorServer/DefaultPattern_mythen3.txt similarity index 100% rename from slsDetectorServers/mythen3DetectorServer/DefaultPattern.txt rename to slsDetectorServers/mythen3DetectorServer/DefaultPattern_mythen3.txt diff --git a/slsDetectorServers/mythen3DetectorServer/Makefile b/slsDetectorServers/mythen3DetectorServer/Makefile index 607d27228..c07029041 100755 --- a/slsDetectorServers/mythen3DetectorServer/Makefile +++ b/slsDetectorServers/mythen3DetectorServer/Makefile @@ -32,6 +32,7 @@ $(PROGS): $(OBJS) mkdir -p $(DESTDIR) $(CC) -o $@ $^ $(CFLAGS) $(LDLIBS) mv $(PROGS) $(DESTDIR) + cp DefaultPattern_mythen3.txt $(DESTDIR) rm $(main_src)*.o clean: diff --git a/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h index b85d01578..8f170e0dd 100644 --- a/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h @@ -24,7 +24,7 @@ #define MAX_EXT_SIGNALS (8) /** Default Parameters */ -#define DEFAULT_PATTERN_FILE ("DefaultPattern.txt") +#define DEFAULT_PATTERN_FILE ("DefaultPattern_mythen3.txt") #define DEFAULT_INTERNAL_GATES (1) #define DEFAULT_EXTERNAL_GATES (1) #define DEFAULT_DYNAMIC_RANGE (32)