Merged globals.h.in in clitkConfiguration.h.in

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index ebe4dff285808e01b16ec47eef0df5c969723bd3..0263f3a031cb7696d0ff821fe993f4f1b49ed64e 100644 (file)
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -57,8 +57,3 @@ TARGET_LINK_LIBRARIES(clitkDicomRTStruct vtkHybrid)
 #ADD_LIBRARY(clitkCommonShared SHARED ${clitkCommon_SRC})
 #SET_TARGET_PROPERTIES(clitkCommonShared PROPERTIES COMPILE_FLAGS -fPIC)
 
-#passing environnment variable
-configure_file (
- globals.h.in
- globals.h
-)

diff --git a/common/clitkConfiguration.h.in b/common/clitkConfiguration.h.in
index f040914a05aa1ea53e1e4b00fb911a9257fd118f..b573cc8c6d4e81fbb3f67b10eb8ee89f8d337549 100644 (file)
--- a/common/clitkConfiguration.h.in
+++ b/common/clitkConfiguration.h.in
@@ -6,4 +6,8 @@
 #cmakedefine01 CLITK_EXPERIMENTAL
 #cmakedefine01 CLITK_MEMORY_INFO
 
+// Global environment variables
+#define OS_NAME "@CMAKE_SYSTEM@"
+#define ARCHITECTURE "@CMAKE_SYSTEM_PROCESSOR@"
+
 #endif

diff --git a/common/globals.h.in b/common/globals.h.in
deleted file mode 100644 (file)
index 384a4d9..0000000
--- a/common/globals.h.in
+++ /dev/null
@@ -1,3 +0,0 @@
-#define OS_NAME "@CMAKE_SYSTEM@"
-#define ARCHITECTURE "@CMAKE_SYSTEM_PROCESSOR@"
-                              
\ No newline at end of file

diff --git a/vv/vvRegisterForm.cxx b/vv/vvRegisterForm.cxx
index 229fb2f135de6837120c4617d41a75176ae20e76..c2bda0e1c581c69b0554ca35c74034b297faf4e9 100644 (file)
--- a/vv/vvRegisterForm.cxx
+++ b/vv/vvRegisterForm.cxx
@@ -21,7 +21,7 @@
 #include <QNetworkRequest>
 #include <QDir>
 #include <QPalette>
-#include "common/globals.h"
+#include "clitkConfiguration.h"
 #include "vvConfiguration.h"
 #include "vvUtils.h"