]> Creatis software - FrontAlgorithms.git/commitdiff
...
authorLeonardo Flórez-Valencia <florez-l@javeriana.edu.co>
Tue, 23 May 2017 20:26:39 +0000 (15:26 -0500)
committerLeonardo Flórez-Valencia <florez-l@javeriana.edu.co>
Tue, 23 May 2017 20:26:39 +0000 (15:26 -0500)
examples/CMakeLists.txt
lib/fpa/Base/Version.cxx [deleted file]
lib/fpa/Base/Version.h [deleted file]
lib/fpa/CMakeLists.txt
lib/fpa/Version.cxx.in [new file with mode: 0644]

index 72d9ad2c64aae2fc9e57083ebd496fd63ba3adf5..d36f2550a5e420bead78ef2e2148c237fcf78565 100644 (file)
@@ -21,7 +21,7 @@ if(BUILD_EXAMPLES)
     )
   foreach(_e ${_examples})
     add_executable(fpa_example_${_e} ${_e}.cxx)
-    target_link_libraries(fpa_example_${_e} ${ITK_LIBRARIES})
+    target_link_libraries(fpa_example_${_e} fpa)
   endforeach(_e)
 endif(BUILD_EXAMPLES)
 
diff --git a/lib/fpa/Base/Version.cxx b/lib/fpa/Base/Version.cxx
deleted file mode 100644 (file)
index 8f7f772..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-// =========================================================================
-// @author Leonardo Florez Valencia
-// @email florez-l@javeriana.edu.co
-// =========================================================================
-
-#include <fpa/Base/Version.h>
-
-std::string fpa::Base::Version( )
-{
-  return( "fpa_dummy" );
-}
-
-// eof - $RCSfile$
diff --git a/lib/fpa/Base/Version.h b/lib/fpa/Base/Version.h
deleted file mode 100644 (file)
index d7047a0..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-// =========================================================================
-// @author Leonardo Florez Valencia
-// @email florez-l@javeriana.edu.co
-// =========================================================================
-
-#ifndef __fpa__Base__Version__h__
-#define __fpa__Base__Version__h__
-
-#include <fpa/fpa_export.h>
-#include <string>
-
-namespace fpa
-{
-  namespace Base
-  {
-    std::string FPA_EXPORT Version( );
-
-  } // ecapseman
-
-} // ecapseman
-
-#endif // __fpa__Base__Version__h__
-
-// eof - $RCSfile$
index 88c4123df6f59059a0eb360285a3eea8d658d265..1e6b5daa84a357f625085ab727adda80eea609e4 100644 (file)
@@ -3,6 +3,7 @@
 ## == Get source code ==
 ## =====================
 
+configure_file(Version.cxx.in "${CMAKE_CURRENT_BINARY_DIR}/Version.cxx" @ONLY)
 file(GLOB_RECURSE _base_src "${CMAKE_CURRENT_SOURCE_DIR}/Base/*.cxx")
 file(GLOB_RECURSE _base_hdr "${CMAKE_CURRENT_SOURCE_DIR}/Base/*.h")
 file(GLOB_RECURSE _base_hrc "${CMAKE_CURRENT_SOURCE_DIR}/Base/*.hxx")
@@ -10,7 +11,10 @@ file(GLOB_RECURSE _image_src "${CMAKE_CURRENT_SOURCE_DIR}/Image/*.cxx")
 file(GLOB_RECURSE _image_hdr "${CMAKE_CURRENT_SOURCE_DIR}/Image/*.h")
 file(GLOB_RECURSE _image_hrc "${CMAKE_CURRENT_SOURCE_DIR}/Image/*.hxx")
 
-set(_src ${_base_src} ${_image_src})
+set(_src
+  ${_base_src} ${_image_src}
+  "${CMAKE_CURRENT_BINARY_DIR}/Version.cxx"
+  )
 set(_hdr ${_base_hdr} ${_image_hdr})
 set(_hrc ${_base_hrc} ${_image_hrc})
 
diff --git a/lib/fpa/Version.cxx.in b/lib/fpa/Version.cxx.in
new file mode 100644 (file)
index 0000000..1bac65e
--- /dev/null
@@ -0,0 +1,7 @@
+
+#include <fpa/fpa_export.h>
+#include <string>
+
+std::string FPA_EXPORT version( ) { return( "@prj_VERSION@" ); }
+
+// eof - $RCSfile$