ENH: Moved decision to build MFCDialog up to top level. It is used in both the Source and Utilities directories.
This commit is contained in:
parent
26c08ee33b
commit
c59cc5a542
@ -105,3 +105,14 @@ CONFIGURE_FILE(${CMake_SOURCE_DIR}/Tests/.NoDartCoverage
|
|||||||
${CMake_BINARY_DIR}/Tests/.NoDartCoverage)
|
${CMake_BINARY_DIR}/Tests/.NoDartCoverage)
|
||||||
CONFIGURE_FILE(${CMake_SOURCE_DIR}/Tests/.NoDartCoverage
|
CONFIGURE_FILE(${CMake_SOURCE_DIR}/Tests/.NoDartCoverage
|
||||||
${CMake_BINARY_DIR}/Modules/.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)
|
||||||
|
@ -95,18 +95,12 @@ TARGET_LINK_LIBRARIES(CMakeLib cmsys)
|
|||||||
# the library is found here
|
# the library is found here
|
||||||
LINK_DIRECTORIES(${CMake_BINARY_DIR}/Source)
|
LINK_DIRECTORIES(${CMake_BINARY_DIR}/Source)
|
||||||
|
|
||||||
IF (WIN32)
|
IF(CMAKE_BUILD_MFC_DIALOG)
|
||||||
IF(NOT UNIX)
|
LINK_LIBRARIES( rpcrt4.lib )
|
||||||
IF( NOT BORLAND )
|
ADD_EXECUTABLE(cmw9xcom cmw9xcom.cxx)
|
||||||
IF(NOT MINGW )
|
TARGET_LINK_LIBRARIES(cmw9xcom CMakeLib)
|
||||||
LINK_LIBRARIES( rpcrt4.lib )
|
SUBDIRS(MFCDialog)
|
||||||
ADD_EXECUTABLE(cmw9xcom cmw9xcom.cxx)
|
ENDIF(CMAKE_BUILD_MFC_DIALOG)
|
||||||
TARGET_LINK_LIBRARIES(cmw9xcom CMakeLib)
|
|
||||||
SUBDIRS(MFCDialog)
|
|
||||||
ENDIF(NOT MINGW )
|
|
||||||
ENDIF( NOT BORLAND )
|
|
||||||
ENDIF(NOT UNIX)
|
|
||||||
ENDIF (WIN32)
|
|
||||||
|
|
||||||
ADD_EXECUTABLE(cmake cmakemain.cxx)
|
ADD_EXECUTABLE(cmake cmakemain.cxx)
|
||||||
ADD_EXECUTABLE(DumpDocumentation cmDumpDocumentation)
|
ADD_EXECUTABLE(DumpDocumentation cmDumpDocumentation)
|
||||||
|
@ -81,32 +81,28 @@ IF(UNIX)
|
|||||||
ENDIF(CURSES_LIBRARY)
|
ENDIF(CURSES_LIBRARY)
|
||||||
ENDIF(UNIX)
|
ENDIF(UNIX)
|
||||||
|
|
||||||
IF(WIN32)
|
IF(CMAKE_BUILD_MFC_DIALOG)
|
||||||
IF(NOT UNIX)
|
SET(CMD ${CMD_DIR}/CMakeSetup${CMD_EXT})
|
||||||
IF(NOT BORLAND)
|
ADD_CUSTOM_COMMAND(
|
||||||
SET(CMD ${CMD_DIR}/CMakeSetup${CMD_EXT})
|
TARGET documentation
|
||||||
ADD_CUSTOM_COMMAND(
|
COMMAND ${CMD}
|
||||||
TARGET documentation
|
ARGS --help-full ${CMake_BINARY_DIR}/Docs/CMakeSetup.txt
|
||||||
COMMAND ${CMD}
|
--help-html ${CMake_BINARY_DIR}/Docs/CMakeSetup.html
|
||||||
ARGS --help-full ${CMake_BINARY_DIR}/Docs/CMakeSetup.txt
|
--help-man ${CMake_BINARY_DIR}/Docs/CMakeSetup.1
|
||||||
--help-html ${CMake_BINARY_DIR}/Docs/CMakeSetup.html
|
DEPENDS ${CMD}
|
||||||
--help-man ${CMake_BINARY_DIR}/Docs/CMakeSetup.1
|
SOURCE ${CMake_SOURCE_DIR}/Utilities/Doxygen/doxyfile.in
|
||||||
DEPENDS ${CMD}
|
OUTPUTS ${CMake_BINARY_DIR}/Docs/CMakeSetup.txt
|
||||||
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
|
||||||
ADD_DEPENDENCIES(documentation CMakeSetup)
|
${CMake_BINARY_DIR}/Docs/CMakeSetup.1
|
||||||
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
|
||||||
INSTALL_FILES(${CMAKE_DOC_DIR} FILES
|
${CMake_BINARY_DIR}/Docs/CMakeSetup.html
|
||||||
${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)
|
||||||
SET(DOC_FILES ${DOC_FILES} ${CMake_BINARY_DIR}/Docs/CMakeSetup.txt)
|
|
||||||
ENDIF(NOT BORLAND)
|
|
||||||
ENDIF(NOT UNIX)
|
|
||||||
ENDIF(WIN32)
|
|
||||||
|
|
||||||
# Drive documentation generation.
|
# Drive documentation generation.
|
||||||
ADD_CUSTOM_COMMAND(
|
ADD_CUSTOM_COMMAND(
|
||||||
|
Loading…
x
Reference in New Issue
Block a user