ENH: Moved decision to build MFCDialog up to top level. It is used in both the Source and Utilities directories.

CMakeLists.txt

@@ -105,3 +105,14 @@ CONFIGURE_FILE(${CMake_SOURCE_DIR}/Tests/.NoDartCoverage
                ${CMake_BINARY_DIR}/Tests/.NoDartCoverage)
 CONFIGURE_FILE(${CMake_SOURCE_DIR}/Tests/.NoDartCoverage
                ${CMake_BINARY_DIR}/Modules/.NoDartCoverage)
+
+SET(CMAKE_BUILD_MFC_DIALOG 0)
+IF(WIN32)
+  IF(NOT UNIX)
+    IF(NOT BORLAND)
+      IF(NOT MINGW )
+        SET(CMAKE_BUILD_MFC_DIALOG 1)
+      ENDIF(NOT MINGW )
+    ENDIF(NOT BORLAND)
+  ENDIF(NOT UNIX)
+ENDIF(WIN32)

Source/CMakeLists.txt

@@ -95,18 +95,12 @@ TARGET_LINK_LIBRARIES(CMakeLib cmsys)
 # the library is found here
 LINK_DIRECTORIES(${CMake_BINARY_DIR}/Source)
 
-IF (WIN32)
-  IF(NOT UNIX)
-    IF( NOT BORLAND )
-      IF(NOT MINGW )
-        LINK_LIBRARIES( rpcrt4.lib )
-        ADD_EXECUTABLE(cmw9xcom cmw9xcom.cxx)
-        TARGET_LINK_LIBRARIES(cmw9xcom CMakeLib)
-        SUBDIRS(MFCDialog)
-      ENDIF(NOT MINGW )
-    ENDIF( NOT BORLAND )
-  ENDIF(NOT UNIX)
-ENDIF (WIN32)
+IF(CMAKE_BUILD_MFC_DIALOG)
+  LINK_LIBRARIES( rpcrt4.lib )
+  ADD_EXECUTABLE(cmw9xcom cmw9xcom.cxx)
+  TARGET_LINK_LIBRARIES(cmw9xcom CMakeLib)
+  SUBDIRS(MFCDialog)
+ENDIF(CMAKE_BUILD_MFC_DIALOG)
 
 ADD_EXECUTABLE(cmake cmakemain.cxx)
 ADD_EXECUTABLE(DumpDocumentation cmDumpDocumentation)

Utilities/CMakeLists.txt

@@ -81,32 +81,28 @@ IF(UNIX)
   ENDIF(CURSES_LIBRARY)
 ENDIF(UNIX)
 
-IF(WIN32)
-  IF(NOT UNIX)
-    IF(NOT BORLAND)
-      SET(CMD ${CMD_DIR}/CMakeSetup${CMD_EXT})
-      ADD_CUSTOM_COMMAND(
-        TARGET documentation
-        COMMAND ${CMD}
-        ARGS --help-full ${CMake_BINARY_DIR}/Docs/CMakeSetup.txt
-             --help-html ${CMake_BINARY_DIR}/Docs/CMakeSetup.html
-             --help-man ${CMake_BINARY_DIR}/Docs/CMakeSetup.1
-        DEPENDS ${CMD}
-        SOURCE ${CMake_SOURCE_DIR}/Utilities/Doxygen/doxyfile.in
-        OUTPUTS ${CMake_BINARY_DIR}/Docs/CMakeSetup.txt
-        )
-      ADD_DEPENDENCIES(documentation CMakeSetup)
-      INSTALL_FILES(${CMAKE_MAN_DIR}/man1 FILES
-        ${CMake_BINARY_DIR}/Docs/CMakeSetup.1
-        )
-      INSTALL_FILES(${CMAKE_DOC_DIR} FILES
-        ${CMake_BINARY_DIR}/Docs/CMakeSetup.txt
-        ${CMake_BINARY_DIR}/Docs/CMakeSetup.html
-        )
-      SET(DOC_FILES ${DOC_FILES} ${CMake_BINARY_DIR}/Docs/CMakeSetup.txt)
-    ENDIF(NOT BORLAND)
-  ENDIF(NOT UNIX)
-ENDIF(WIN32)
+IF(CMAKE_BUILD_MFC_DIALOG)
+  SET(CMD ${CMD_DIR}/CMakeSetup${CMD_EXT})
+  ADD_CUSTOM_COMMAND(
+    TARGET documentation
+    COMMAND ${CMD}
+    ARGS --help-full ${CMake_BINARY_DIR}/Docs/CMakeSetup.txt
+         --help-html ${CMake_BINARY_DIR}/Docs/CMakeSetup.html
+         --help-man ${CMake_BINARY_DIR}/Docs/CMakeSetup.1
+    DEPENDS ${CMD}
+    SOURCE ${CMake_SOURCE_DIR}/Utilities/Doxygen/doxyfile.in
+    OUTPUTS ${CMake_BINARY_DIR}/Docs/CMakeSetup.txt
+    )
+  ADD_DEPENDENCIES(documentation CMakeSetup)
+  INSTALL_FILES(${CMAKE_MAN_DIR}/man1 FILES
+    ${CMake_BINARY_DIR}/Docs/CMakeSetup.1
+    )
+  INSTALL_FILES(${CMAKE_DOC_DIR} FILES
+    ${CMake_BINARY_DIR}/Docs/CMakeSetup.txt
+    ${CMake_BINARY_DIR}/Docs/CMakeSetup.html
+    )
+  SET(DOC_FILES ${DOC_FILES} ${CMake_BINARY_DIR}/Docs/CMakeSetup.txt)
+ENDIF(CMAKE_BUILD_MFC_DIALOG)
 
 # Drive documentation generation.
 ADD_CUSTOM_COMMAND(