Bug 1310: Some program were not being installed because lofar_add_executable()...

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

 include(LofarCTest)
-
-set(CHECK_PROGRAMS)
-
-foreach(prog ${CHECK_PROGRAMS})
-  lofar_add_executable(${prog} ${prog}.cc)
-endforeach(prog ${CHECK_PROGRAMS})

MAC/APL/PAC/IBS_Protocol/include/APL/IBS_Protocol/Package__Version.h

-//# 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

MAC/APL/PAC/ITRFBeamServer/src/Package__Version.h

-//# 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

MAC/APL/PAC/ITRFBeamServer/src/versionitrfbeamserver.cc

-//# 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;
-}

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)
 

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)

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)

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)