kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Brad King 2003-08-22 12:53:25 -04:00
parent 26c08ee33b
commit c59cc5a542
3 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -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)

10
Source/CMakeLists.txt
View File

@ -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)
IF( NOT BORLAND )
IF(NOT MINGW )
LINK_LIBRARIES( rpcrt4.lib ) LINK_LIBRARIES( rpcrt4.lib )
ADD_EXECUTABLE(cmw9xcom cmw9xcom.cxx) ADD_EXECUTABLE(cmw9xcom cmw9xcom.cxx)
TARGET_LINK_LIBRARIES(cmw9xcom CMakeLib) TARGET_LINK_LIBRARIES(cmw9xcom CMakeLib)
SUBDIRS(MFCDialog) SUBDIRS(MFCDialog)
ENDIF(NOT MINGW ) ENDIF(CMAKE_BUILD_MFC_DIALOG)
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)

8
Utilities/CMakeLists.txt
View File

@ -81,9 +81,7 @@ IF(UNIX)
ENDIF(CURSES_LIBRARY) ENDIF(CURSES_LIBRARY)
ENDIF(UNIX) ENDIF(UNIX)
IF(WIN32) IF(CMAKE_BUILD_MFC_DIALOG)
IF(NOT UNIX)
IF(NOT BORLAND)
SET(CMD ${CMD_DIR}/CMakeSetup${CMD_EXT}) SET(CMD ${CMD_DIR}/CMakeSetup${CMD_EXT})
ADD_CUSTOM_COMMAND( ADD_CUSTOM_COMMAND(
TARGET documentation TARGET documentation
@ -104,9 +102,7 @@ IF(WIN32)
${CMake_BINARY_DIR}/Docs/CMakeSetup.html ${CMake_BINARY_DIR}/Docs/CMakeSetup.html
) )
SET(DOC_FILES ${DOC_FILES} ${CMake_BINARY_DIR}/Docs/CMakeSetup.txt) SET(DOC_FILES ${DOC_FILES} ${CMake_BINARY_DIR}/Docs/CMakeSetup.txt)
ENDIF(NOT BORLAND) ENDIF(CMAKE_BUILD_MFC_DIALOG)
ENDIF(NOT UNIX)
ENDIF(WIN32)
# Drive documentation generation. # Drive documentation generation.
ADD_CUSTOM_COMMAND( ADD_CUSTOM_COMMAND(