From: Simon Rit <simon.rit@creatis.insa-lyon.fr>
Date: Thu, 19 May 2011 14:06:35 +0000 (+0200)
Subject: Merged globals.h.in in clitkConfiguration.h.in
X-Git-Tag: v1.2.1~12
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=43dac9cc8846cf1519256afbb4d408e42e23f3fe;p=clitk.git

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

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index ebe4dff..0263f3a 100644
--- 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 f040914..b573cc8 100644
--- 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
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 229fb2f..c2bda0e 100644
--- 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"