Browse Source

Merge branch 'update-ctkconfig-header'

* update-ctkconfig-header:
  Add ifndef/define preprocessor statements to ctkConfig.h.in
  For sake of consistency, rename CTKConfig.h into ctkConfig.h
Jean-Christophe Fillion-Robin 14 years ago
parent
commit
f2be7d3f4b

+ 1 - 1
Libs/PluginFramework/ctkPluginFrameworkLauncher.cpp

@@ -35,7 +35,7 @@
 #include <cstdlib>
 #endif // _WIN32
 
-#include <CTKConfig.h>
+#include <ctkConfig.h>
 
 class ctkPluginFrameworkLauncherPrivate
 {

+ 2 - 2
Utilities/LastConfigureStep/CTKGenerateCTKConfig.cmake

@@ -137,8 +137,8 @@ CONFIGURE_FILE(${CTK_SOURCE_DIR}/CTKConfig.cmake.in
                ${CTK_SUPERBUILD_BINARY_DIR}/CTKConfig.cmake @ONLY IMMEDIATE)
 CONFIGURE_FILE(${CTK_SOURCE_DIR}/CTKConfigVersion.cmake.in
                ${CTK_SUPERBUILD_BINARY_DIR}/CTKConfigVersion.cmake @ONLY IMMEDIATE)
-CONFIGURE_FILE(${CTK_SOURCE_DIR}/CTKConfig.h.in
-               ${CTK_SUPERBUILD_BINARY_DIR}/CTKConfig.h @ONLY IMMEDIATE)
+CONFIGURE_FILE(${CTK_SOURCE_DIR}/ctkConfig.h.in
+               ${CTK_SUPERBUILD_BINARY_DIR}/ctkConfig.h @ONLY IMMEDIATE)
 
 #-----------------------------------------------------------------------------
 # Settings specific to the install tree.

+ 6 - 0
CTKConfig.h.in

@@ -1 +1,7 @@
+#ifndef __ctkConfig_h
+#define __ctkConfig_h
+
 #define CTK_PLUGIN_DIR "@CTK_BINARY_DIR@/bin/plugins/"
+
+#endif
+