bug 1005: Tmp solution for cmakefile

RTCP/CNProc/src/CMakeLists.txt

@@ -33,8 +33,8 @@ enable_language(ASM-BGP)
 
 if (CMAKE_ASM-BGP_COMPILER_WORKS)
   file(GLOB amsSrcs CorrelatorAsm.S
-                    FIR_Asm
-		    FFT_Asm)
+                    FIR_Asm.S
+		    FFT_Asm.S)
 endif (CMAKE_ASM-BGP_COMPILER_WORKS)  
 
 ## ------------------------------------------------------------------------------
@@ -77,9 +77,11 @@ target_link_libraries (CN_Processing
                        cnproc
                       )
 
+SET (CMAKE_ASM-BGP_LINK_EXECUTABLE "${ASM-BGP} <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
 
 set_target_properties(CN_Processing
-                      PROPERTIES LINK_FLAGS "-static"
+                      PROPERTIES LINK_FLAGS "-static -g -O2 -W -Wall -Woverloaded-virtual -Wno-unknown-pragmas -B/bgsys/drivers/ppcfloor/gnu-linux/powerpc-bgp-linux/bin"
+                                 LINKER_LANGUAGE ASM-BGP
 )
 
 #set_target_properties(CN_Processing

RTCP/CNProc/src/CN_Processing_main.cc

@@ -30,8 +30,9 @@
 #include <Stream/SocketStream.h>
 #include <CNProc/LocationInfo.h>
 #include <CNProc/CN_Processing.h>
+#if !defined HAVE_PKVERSION
 #include <CNProc/Package__Version.h>
-
+#endif
 #include <boost/lexical_cast.hpp>
 #include <execinfo.h>
 
@@ -91,11 +92,12 @@ int main(int argc, char **argv)
 
     LocationInfo locationInfo;
 
+#if !defined HAVE_PKVERSION    
     if (locationInfo.rank() == 0) {
       std::string type = "brief";
       Version::show<CNProcVersion> (std::cout, "CNProc", type);
     }
-
+#endif
     std::clog << "creating connection to ION ..." << std::endl;
     
     Stream *ionStream;