From 1b43c94d6d0a3b50792c59fe57933f52a8a1402f Mon Sep 17 00:00:00 2001
From: Marcel Loose <loose@astron.nl>
Date: Wed, 20 Jan 2010 14:26:16 +0000
Subject: [PATCH] Bug 1310: Some program were not being installed because
lofar_add_executable() was used, instead of lofar_add_bin_program()
---
LCS/Stream/test/CMakeLists.txt | 6 ---
.../APL/IBS_Protocol/Package__Version.h | 40 -------------------
.../PAC/ITRFBeamServer/src/Package__Version.h | 40 -------------------
.../src/versionitrfbeamserver.cc | 17 --------
RTCP/CNProc/src/CMakeLists.txt | 15 ++-----
RTCP/FCNP/src/CMakeLists.txt | 2 +-
RTCP/Storage/src/CMakeLists.txt | 8 ++--
SAS/OTB/jOTDB2/src/CMakeLists.txt | 2 +-
8 files changed, 9 insertions(+), 121 deletions(-)
delete mode 100644 MAC/APL/PAC/IBS_Protocol/include/APL/IBS_Protocol/Package__Version.h
delete mode 100644 MAC/APL/PAC/ITRFBeamServer/src/Package__Version.h
delete mode 100644 MAC/APL/PAC/ITRFBeamServer/src/versionitrfbeamserver.cc
diff --git a/LCS/Stream/test/CMakeLists.txt b/LCS/Stream/test/CMakeLists.txt
index 35043d6575b..d05ec53f3d4 100644
--- a/LCS/Stream/test/CMakeLists.txt
+++ b/LCS/Stream/test/CMakeLists.txt
@@ -1,7 +1 @@
include(LofarCTest)
-
-set(CHECK_PROGRAMS)
-
-foreach(prog ${CHECK_PROGRAMS})
- lofar_add_executable(${prog} ${prog}.cc)
-endforeach(prog ${CHECK_PROGRAMS})
diff --git a/MAC/APL/PAC/IBS_Protocol/include/APL/IBS_Protocol/Package__Version.h b/MAC/APL/PAC/IBS_Protocol/include/APL/IBS_Protocol/Package__Version.h
deleted file mode 100644
index c33c551cac2..00000000000
--- a/MAC/APL/PAC/IBS_Protocol/include/APL/IBS_Protocol/Package__Version.h
+++ /dev/null
@@ -1,40 +0,0 @@
-//# Get revision info; generated by autoconf_share/makeversion
-
-#ifndef LOFAR_IBS_PROTOCOL_PACKAGE__VERSION_H
-#define LOFAR_IBS_PROTOCOL_PACKAGE__VERSION_H
-
-#include <Common/Version.h>
-
-// Class to get the version (revision) of the package and the packages it uses.
-namespace LOFAR {
- class IBS_ProtocolVersion
- {
- public:
- // Get the info for this package.
- static Version getInfo();
-
- // Get the version number of the package (as given in repository).
- static std::string getVersion();
- // Get the svn version number of the package according to configure.in.
- static std::string getConfVersion();
- // Get the global revision number of the package.
- static std::string getRevision();
- // Get the local revision number of the package.
- static std::string getPackageRevision();
- // Get the number of files differing from repository.
- // Usually this is blank, but it can tell the nr of changed files.
- static std::string getNrChangedFiles();
- // Get the date/time the package was built (in fact, configured).
- static std::string getBuildTime();
- // Get the name of the user who built the package.
- static std::string getBuildUser();
- // Get the machine the package was built on.
- static std::string getBuildMachine();
-
- // Append the vector with the vinfo of this package and used packages.
- static void fillInfo (int level,
- std::vector<Version::PkgInfo>& vec);
- };
-}
-
-#endif
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/Package__Version.h b/MAC/APL/PAC/ITRFBeamServer/src/Package__Version.h
deleted file mode 100644
index c8f9c5a35fe..00000000000
--- a/MAC/APL/PAC/ITRFBeamServer/src/Package__Version.h
+++ /dev/null
@@ -1,40 +0,0 @@
-//# Get revision info; generated by autoconf_share/makeversion
-
-#ifndef LOFAR_ITRFBEAMSERVER_PACKAGE__VERSION_H
-#define LOFAR_ITRFBEAMSERVER_PACKAGE__VERSION_H
-
-#include <Common/Version.h>
-
-// Class to get the version (revision) of the package and the packages it uses.
-namespace LOFAR {
- class ITRFBeamServerVersion
- {
- public:
- // Get the info for this package.
- static Version getInfo();
-
- // Get the version number of the package (as given in repository).
- static std::string getVersion();
- // Get the svn version number of the package according to configure.in.
- static std::string getConfVersion();
- // Get the global revision number of the package.
- static std::string getRevision();
- // Get the local revision number of the package.
- static std::string getPackageRevision();
- // Get the number of files differing from repository.
- // Usually this is blank, but it can tell the nr of changed files.
- static std::string getNrChangedFiles();
- // Get the date/time the package was built (in fact, configured).
- static std::string getBuildTime();
- // Get the name of the user who built the package.
- static std::string getBuildUser();
- // Get the machine the package was built on.
- static std::string getBuildMachine();
-
- // Append the vector with the vinfo of this package and used packages.
- static void fillInfo (int level,
- std::vector<Version::PkgInfo>& vec);
- };
-}
-
-#endif
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/versionitrfbeamserver.cc b/MAC/APL/PAC/ITRFBeamServer/src/versionitrfbeamserver.cc
deleted file mode 100644
index f5e144abe0e..00000000000
--- a/MAC/APL/PAC/ITRFBeamServer/src/versionitrfbeamserver.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-//# Print revision info; generated by autoconf_share/makeversion
-
-#include <ITRFBeamServer/Package__Version.h>
-#include <Common/Version.h>
-#include <iostream>
-
-using namespace LOFAR;
-
-int main (int argc, const char* argv[])
-{
- std::string type = "brief";
- if (argc > 1) {
- type = argv[1];
- }
- Version::show<ITRFBeamServerVersion> (std::cout, "ITRFBeamServer", type);
- return 0;
-}
diff --git a/RTCP/CNProc/src/CMakeLists.txt b/RTCP/CNProc/src/CMakeLists.txt
index c7427040e37..78163d27da7 100644
--- a/RTCP/CNProc/src/CMakeLists.txt
+++ b/RTCP/CNProc/src/CMakeLists.txt
@@ -27,7 +27,7 @@ set(cnproc_LIB_SRCS
# Maybe we shoud use LOFAR_COMPILER_SUITE, because ASM-BGP_COMPILER_WORKS
# is not reliable: i.e.
-#if(LOFAR_COMPILER_SUITE STREQUAL GNUBGP)
+#if(LOFAR_COMPILER_SUITE STREQUAL BGPCN)
if(CMAKE_ASM-BGP_COMPILER_WORKS)
list(APPEND cnproc_LIB_SRCS
BeamFormerAsm.S
@@ -35,17 +35,10 @@ if(CMAKE_ASM-BGP_COMPILER_WORKS)
FIR_Asm.S
FFT_Asm.S)
endif(CMAKE_ASM-BGP_COMPILER_WORKS)
-#endif(LOFAR_COMPILER_SUITE STREQUAL GNUBGP)
+#endif(LOFAR_COMPILER_SUITE STREQUAL BGPCN)
lofar_add_library(cnproc ${cnproc_LIB_SRCS})
-#message(STATUS "cnproc_LIB_SRCS = ${cnproc_LIB_SRCS}")
-#message(STATUS "ASM-BGP = ${ASM-BGP}")
-#message(STATUS "CMAKE_ASM-BGP_COMPILER_WORKS = ${CMAKE_ASM-BGP_COMPILER_WORKS}")
-#message(STATUS "CMAKE_ASM-BGP_COMPILER = ${CMAKE_ASM-BGP_COMPILER}")
-#message(STATUS "CMAKE_ASM-BGP_COMPILE_OBJECT = ${CMAKE_ASM-BGP_COMPILE_OBJECT}")
-#message(STATUS "CMAKE_ASM-BGP_LINK_EXECUTABLE = ${CMAKE_ASM-BGP_LINK_EXECUTABLE}")
-
-lofar_add_executable(CN_Processing CN_Processing_main.cc)
-lofar_add_executable(versioncnproc versioncnproc.cc)
+lofar_add_bin_program(CN_Processing CN_Processing_main.cc)
+lofar_add_bin_program(versioncnproc versioncnproc.cc)
diff --git a/RTCP/FCNP/src/CMakeLists.txt b/RTCP/FCNP/src/CMakeLists.txt
index 364eda18acd..190984276a9 100644
--- a/RTCP/FCNP/src/CMakeLists.txt
+++ b/RTCP/FCNP/src/CMakeLists.txt
@@ -12,4 +12,4 @@ lofar_add_library(fcnp_cn Package__Version.cc fcnp_cn.cc)
lofar_add_library(fcnp_ion Package__Version.cc fcnp_ion.cc)
# Add executable
-lofar_add_executable(versionfcnp versionfcnp.cc)
+lofar_add_bin_program(versionfcnp versionfcnp.cc)
diff --git a/RTCP/Storage/src/CMakeLists.txt b/RTCP/Storage/src/CMakeLists.txt
index 14992cc0bbc..c108c83b29a 100644
--- a/RTCP/Storage/src/CMakeLists.txt
+++ b/RTCP/Storage/src/CMakeLists.txt
@@ -2,7 +2,7 @@
include(LofarPackageVersion)
-set(storage_LIB_SRCS
+lofar_add_library(storage
Package__Version.cc
InputThread.cc
OutputThread.cc
@@ -12,7 +12,5 @@ set(storage_LIB_SRCS
MSWriterFile.cc
MeasurementSetFormat.cc)
-lofar_add_library(storage ${storage_LIB_SRCS})
-
-lofar_add_executable(Storage_main Storage_main.cc)
-lofar_add_executable(versionstorage versionstorage.cc)
+lofar_add_bin_program(Storage_main Storage_main.cc)
+lofar_add_bin_program(versionstorage versionstorage.cc)
diff --git a/SAS/OTB/jOTDB2/src/CMakeLists.txt b/SAS/OTB/jOTDB2/src/CMakeLists.txt
index 0ecefabad79..45fb42c5d4d 100644
--- a/SAS/OTB/jOTDB2/src/CMakeLists.txt
+++ b/SAS/OTB/jOTDB2/src/CMakeLists.txt
@@ -15,5 +15,5 @@ lofar_add_library(jotdb2 SHARED
nl_astron_lofar_sas_otb_jotdb2_jInitCPPLogger.cc
nl_astron_lofar_sas_otb_jotdb2_jTreeValue.cc)
-lofar_add_executable(versionjotdb2 versionjotdb2.cc)
+lofar_add_bin_program(versionjotdb2 versionjotdb2.cc)
--
GitLab