diff options
| author | Brad King <brad.king@kitware.com> | 2003-08-22 16:53:25 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2003-08-22 16:53:25 (GMT) |
| commit | c59cc5a542ca78cba2983d91b588ae1f7ee490dd (patch) | |
| tree | 8a8cb774926d628d38d7fb5ae158bd70c50b511a | |
| parent | 26c08ee33b29a9b9b0ac01d5cfd26ff18759c43c (diff) | |
| download | CMake-c59cc5a542ca78cba2983d91b588ae1f7ee490dd.zip CMake-c59cc5a542ca78cba2983d91b588ae1f7ee490dd.tar.gz CMake-c59cc5a542ca78cba2983d91b588ae1f7ee490dd.tar.bz2 | |
ENH: Moved decision to build MFCDialog up to top level. It is used in both the Source and Utilities directories.
| -rw-r--r-- | CMakeLists.txt | 11 | ||||
| -rw-r--r-- | Source/CMakeLists.txt | 18 | ||||
| -rw-r--r-- | Utilities/CMakeLists.txt | 48 |
3 files changed, 39 insertions, 38 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a75942e..42f34ad 100644 --- a/CMakeLists.txt +++ b/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) diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index b06883a..81e79f6 100644 --- a/Source/CMakeLists.txt +++ b/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) diff --git a/Utilities/CMakeLists.txt b/Utilities/CMakeLists.txt index 15de8b6..6b89920 100644 --- a/Utilities/CMakeLists.txt +++ b/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( |