Merge topic 'fix-cmake-self-references'

df1e00f Refer to self with CMake_(SOURCE|BINARY)_DIR (#10046)

7 files changed, 41 insertions, 41 deletions

diff --git a/Utilities/Doxygen/CMakeLists.txt b/Utilities/Doxygen/CMakeLists.txt
index 8888aba..5d076e0 100644
--- a/Utilities/Doxygen/CMakeLists.txt
+++ b/Utilities/Doxygen/CMakeLists.txt
@@ -27,15 +27,15 @@ IF (BUILD_DOCUMENTATION)
   ENDIF(NOT DOT_PATH)
 
   CONFIGURE_FILE(
-    ${CMAKE_SOURCE_DIR}/Utilities/Doxygen/doxyfile.in
-    ${CMAKE_BINARY_DIR}/Utilities/Doxygen/doxyfile)
+    ${CMake_SOURCE_DIR}/Utilities/Doxygen/doxyfile.in
+    ${CMake_BINARY_DIR}/Utilities/Doxygen/doxyfile)
 
   CONFIGURE_FILE(
-    ${CMAKE_SOURCE_DIR}/Utilities/Doxygen/doc_makeall.sh.in
-    ${CMAKE_BINARY_DIR}/Utilities/Doxygen/doc_makeall.sh)
+    ${CMake_SOURCE_DIR}/Utilities/Doxygen/doc_makeall.sh.in
+    ${CMake_BINARY_DIR}/Utilities/Doxygen/doc_makeall.sh)
 
   ADD_CUSTOM_TARGET(DoxygenDoc
     ${BASH}
-    ${CMAKE_BINARY_DIR}/Utilities/Doxygen/doc_makeall.sh)
+    ${CMake_BINARY_DIR}/Utilities/Doxygen/doc_makeall.sh)
 
 ENDIF (BUILD_DOCUMENTATION)
diff --git a/Utilities/Doxygen/doc_makeall.sh.in b/Utilities/Doxygen/doc_makeall.sh.in
index e5cf240..a1b00e7 100755
--- a/Utilities/Doxygen/doc_makeall.sh.in
+++ b/Utilities/Doxygen/doc_makeall.sh.in
@@ -48,7 +48,7 @@ export PATH_TO_VTK_DOX_SCRIPTS="@VTK_SOURCE_DIR@/Utilities/Doxygen"
 # Example: 
 #   SOURCE_DIR=@VTK_SOURCE_DIR@
 #
-export SOURCE_DIR="@CMAKE_SOURCE_DIR@"
+export SOURCE_DIR="@CMake_SOURCE_DIR@"
 
 # REL_PATH_TO_TOP:
 # Relative path from the top directory of the source files to the directory
@@ -71,7 +71,7 @@ export REL_PATH_TO_TOP=.
 #   DOXTEMP=DOXTEMP=@VTK_BINARY_DIR@/Utilities/Doxygen
 #   INTERMEDIATE_DOX_DIR=$DOXTEMP/dox
 #
-export DOXTEMP="@CMAKE_BINARY_DIR@/Utilities/Doxygen"
+export DOXTEMP="@CMake_BINARY_DIR@/Utilities/Doxygen"
 export INTERMEDIATE_DOX_DIR="$DOXTEMP/dox"
 
 # DOXYFILE:
diff --git a/Utilities/Doxygen/doxyfile.in b/Utilities/Doxygen/doxyfile.in
index ad5e377..c3d3a38 100644
--- a/Utilities/Doxygen/doxyfile.in
+++ b/Utilities/Doxygen/doxyfile.in
@@ -31,19 +31,19 @@ GRAPHICAL_HIERARCHY  = YES
 
 ALLEXTERNALS         = NO
 
-IMAGE_PATH           = "@CMAKE_BINARY_DIR@/Utilities/Doxygen/contrib"
+IMAGE_PATH           = "@CMake_BINARY_DIR@/Utilities/Doxygen/contrib"
 
-OUTPUT_DIRECTORY     = "@CMAKE_BINARY_DIR@/Utilities/Doxygen/doc"
+OUTPUT_DIRECTORY     = "@CMake_BINARY_DIR@/Utilities/Doxygen/doc"
 
 INPUT                = \
- "@CMAKE_SOURCE_DIR@/Source" \
- "@CMAKE_SOURCE_DIR@/Source/CPack" \
- "@CMAKE_SOURCE_DIR@/Source/CTest" \
- "@CMAKE_SOURCE_DIR@/Source/CursesDialog" \
- "@CMAKE_SOURCE_DIR@/Source/MFCDialog" \
- "@CMAKE_BINARY_DIR@/Source/kwsys" \
- "@CMAKE_BINARY_DIR@/Source/cmsys" \
- "@CMAKE_BINARY_DIR@/Utilities/Doxygen/dox/doc_CMake_contributors.dox" \
+ "@CMake_SOURCE_DIR@/Source" \
+ "@CMake_SOURCE_DIR@/Source/CPack" \
+ "@CMake_SOURCE_DIR@/Source/CTest" \
+ "@CMake_SOURCE_DIR@/Source/CursesDialog" \
+ "@CMake_SOURCE_DIR@/Source/MFCDialog" \
+ "@CMake_BINARY_DIR@/Source/kwsys" \
+ "@CMake_BINARY_DIR@/Source/cmsys" \
+ "@CMake_BINARY_DIR@/Utilities/Doxygen/dox/doc_CMake_contributors.dox" \
 
 EXTRACT_ALL          = YES
 EXTRACT_PRIVATE      = NO
diff --git a/Utilities/KWStyle/CMake.kws.xml.in b/Utilities/KWStyle/CMake.kws.xml.in
index 9c5efee..c2b4429 100644
--- a/Utilities/KWStyle/CMake.kws.xml.in
+++ b/Utilities/KWStyle/CMake.kws.xml.in
@@ -2,7 +2,7 @@
 <Description>
 <LineLength>79</LineLength>
 <!--
-<Header>"@CMAKE_SOURCE_DIR@/Utilities/KWStyle/Headers",false,true</Header>
+<Header>"@CMake_SOURCE_DIR@/Utilities/KWStyle/Headers",false,true</Header>
 <Functions>
 <regex>[A-Z]</regex>
 <length>100</length>
diff --git a/Utilities/KWStyle/CMakeFiles.txt.in b/Utilities/KWStyle/CMakeFiles.txt.in
index aa4ee74..a95aac6 100644
--- a/Utilities/KWStyle/CMakeFiles.txt.in
+++ b/Utilities/KWStyle/CMakeFiles.txt.in
@@ -1,15 +1,15 @@
-"@CMAKE_SOURCE_DIR@/Source/*.txx"
-"@CMAKE_SOURCE_DIR@/Source/*.cxx"
-"@CMAKE_SOURCE_DIR@/Source/*.h*"
-"@CMAKE_SOURCE_DIR@/Source/CPack/*.txx"
-"@CMAKE_SOURCE_DIR@/Source/CPack/*.cxx"
-"@CMAKE_SOURCE_DIR@/Source/CPack/*.h*"
-"@CMAKE_SOURCE_DIR@/Source/CTest/*.txx"
-"@CMAKE_SOURCE_DIR@/Source/CTest/*.cxx"
-"@CMAKE_SOURCE_DIR@/Source/CTest/*.h*"
-"@CMAKE_SOURCE_DIR@/Source/CurseDialog/*.h*"
-"@CMAKE_SOURCE_DIR@/Source/CurseDialog/*.cxx"
-"@CMAKE_SOURCE_DIR@/Source/CurseDialog/*.txx"
+"@CMake_SOURCE_DIR@/Source/*.txx"
+"@CMake_SOURCE_DIR@/Source/*.cxx"
+"@CMake_SOURCE_DIR@/Source/*.h*"
+"@CMake_SOURCE_DIR@/Source/CPack/*.txx"
+"@CMake_SOURCE_DIR@/Source/CPack/*.cxx"
+"@CMake_SOURCE_DIR@/Source/CPack/*.h*"
+"@CMake_SOURCE_DIR@/Source/CTest/*.txx"
+"@CMake_SOURCE_DIR@/Source/CTest/*.cxx"
+"@CMake_SOURCE_DIR@/Source/CTest/*.h*"
+"@CMake_SOURCE_DIR@/Source/CurseDialog/*.h*"
+"@CMake_SOURCE_DIR@/Source/CurseDialog/*.cxx"
+"@CMake_SOURCE_DIR@/Source/CurseDialog/*.txx"
 -f (Lexer\.h)
 -f (Lexer\.cxx)
 -f (Parser\.cxx)
diff --git a/Utilities/KWStyle/CMakeLists.txt b/Utilities/KWStyle/CMakeLists.txt
index d8269c6..4803ffa 100644
--- a/Utilities/KWStyle/CMakeLists.txt
+++ b/Utilities/KWStyle/CMakeLists.txt
@@ -36,27 +36,27 @@ IF(CMAKE_USE_KWSTYLE)
     SET(KWSTYLE_ARGUMENTS -msvc ${KWSTYLE_ARGUMENTS})
   ENDIF(KWSTYLE_USE_MSVC_FORMAT)
 
-  CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/Utilities/KWStyle/CMake.kws.xml.in
-               ${CMAKE_BINARY_DIR}/CMake.kws.xml)
-  CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/Utilities/KWStyle/CMakeMoreChecks.kws.xml.in
-               ${CMAKE_BINARY_DIR}/CMakeMoreChecks.kws.xml)
+  CONFIGURE_FILE(${CMake_SOURCE_DIR}/Utilities/KWStyle/CMake.kws.xml.in
+               ${CMake_BINARY_DIR}/CMake.kws.xml)
+  CONFIGURE_FILE(${CMake_SOURCE_DIR}/Utilities/KWStyle/CMakeMoreChecks.kws.xml.in
+               ${CMake_BINARY_DIR}/CMakeMoreChecks.kws.xml)
 
-  CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/Utilities/KWStyle/CMakeFiles.txt.in
-                 ${CMAKE_BINARY_DIR}/CMakeKWSFiles.txt)
+  CONFIGURE_FILE(${CMake_SOURCE_DIR}/Utilities/KWStyle/CMakeFiles.txt.in
+                 ${CMake_BINARY_DIR}/CMakeKWSFiles.txt)
 
   ADD_CUSTOM_COMMAND(
-    OUTPUT ${CMAKE_BINARY_DIR}/KWStyleReport.txt
+    OUTPUT ${CMake_BINARY_DIR}/KWStyleReport.txt
     COMMAND ${KWSTYLE_EXECUTABLE}
-    ARGS    -xml ${CMAKE_BINARY_DIR}/CMake.kws.xml -o ${CMAKE_SOURCE_DIR}/Utilities/KWStyle/CMakeOverwrite.txt -v ${KWSTYLE_ARGUMENTS} -D ${CMAKE_BINARY_DIR}/CMakeKWSFiles.txt 
+    ARGS    -xml ${CMake_BINARY_DIR}/CMake.kws.xml -o ${CMake_SOURCE_DIR}/Utilities/KWStyle/CMakeOverwrite.txt -v ${KWSTYLE_ARGUMENTS} -D ${CMake_BINARY_DIR}/CMakeKWSFiles.txt
     COMMENT "Coding Style Checker"
     )
 
   ADD_CUSTOM_TARGET(MoreStyleChecks
     COMMAND ${KWSTYLE_EXECUTABLE}
-    -xml ${CMAKE_BINARY_DIR}/CMakeMoreChecks.kws.xml -html ${CMAKE_BINARY_DIR}/html -o ${CMAKE_SOURCE_DIR}/Utilities/KWStyle/CMakeOverwrite.txt -v ${KWSTYLE_ARGUMENTS} -D ${CMAKE_BINARY_DIR}/CMakeKWSFiles.txt 
+    -xml ${CMake_BINARY_DIR}/CMakeMoreChecks.kws.xml -html ${CMake_BINARY_DIR}/html -o ${CMake_SOURCE_DIR}/Utilities/KWStyle/CMakeOverwrite.txt -v ${KWSTYLE_ARGUMENTS} -D ${CMake_BINARY_DIR}/CMakeKWSFiles.txt
     COMMENT "Coding Style Checker, more checks enabled"
     )
 
-  ADD_CUSTOM_TARGET(StyleCheck DEPENDS ${CMAKE_BINARY_DIR}/KWStyleReport.txt)
+  ADD_CUSTOM_TARGET(StyleCheck DEPENDS ${CMake_BINARY_DIR}/KWStyleReport.txt)
 ENDIF(CMAKE_USE_KWSTYLE)
 
diff --git a/Utilities/KWStyle/CMakeMoreChecks.kws.xml.in b/Utilities/KWStyle/CMakeMoreChecks.kws.xml.in
index f47f8e8..b7078e0 100644
--- a/Utilities/KWStyle/CMakeMoreChecks.kws.xml.in
+++ b/Utilities/KWStyle/CMakeMoreChecks.kws.xml.in
@@ -2,7 +2,7 @@
 <Description>
   <ErrorThreshold>10</ErrorThreshold> 
   <LineLength>79</LineLength>
-  <Header>"@CMAKE_SOURCE_DIR@/Utilities/KWStyle/Headers",false,true</Header>
+  <Header>"@CMake_SOURCE_DIR@/Utilities/KWStyle/Headers",false,true</Header>
   <Functions>
     <regex>^(cm)?[A-Z]</regex>
     <length>200</length>