ENH: More cleanups and reorganization
This commit is contained in:
parent
f451469d58
commit
89f603b620
|
@ -127,12 +127,12 @@ CONFIGURE_FILE(${CMake_SOURCE_DIR}/Tests/.NoDartCoverage
|
||||||
CONFIGURE_FILE(${CMake_SOURCE_DIR}/CTestCustom.ctest.in
|
CONFIGURE_FILE(${CMake_SOURCE_DIR}/CTestCustom.ctest.in
|
||||||
${CMake_BINARY_DIR}/CTestCustom.ctest @ONLY)
|
${CMake_BINARY_DIR}/CTestCustom.ctest @ONLY)
|
||||||
|
|
||||||
SET(CMAKE_BUILD_MFC_DIALOG 0)
|
SET(CMAKE_BUILD_ON_VISUAL_STUDIO 0)
|
||||||
IF(WIN32)
|
IF(WIN32)
|
||||||
IF(NOT UNIX)
|
IF(NOT UNIX)
|
||||||
IF(NOT BORLAND)
|
IF(NOT BORLAND)
|
||||||
IF(NOT MINGW )
|
IF(NOT MINGW )
|
||||||
SET(CMAKE_BUILD_MFC_DIALOG 1)
|
SET(CMAKE_BUILD_ON_VISUAL_STUDIO 1)
|
||||||
ENDIF(NOT MINGW )
|
ENDIF(NOT MINGW )
|
||||||
ENDIF(NOT BORLAND)
|
ENDIF(NOT BORLAND)
|
||||||
ENDIF(NOT UNIX)
|
ENDIF(NOT UNIX)
|
||||||
|
|
|
@ -1,5 +1,20 @@
|
||||||
CMAKE_MINIMUM_REQUIRED(VERSION 1.5)
|
CMAKE_MINIMUM_REQUIRED(VERSION 1.5)
|
||||||
|
|
||||||
|
# configure the .h file
|
||||||
|
CONFIGURE_FILE(
|
||||||
|
${CMake_SOURCE_DIR}/Source/cmConfigure.cmake.h.in
|
||||||
|
${CMake_BINARY_DIR}/Source/cmConfigure.h )
|
||||||
|
|
||||||
|
# add the include path to find the .h
|
||||||
|
INCLUDE_DIRECTORIES(${CMake_BINARY_DIR}/Source)
|
||||||
|
INCLUDE_DIRECTORIES(${CMake_SOURCE_DIR}/Source)
|
||||||
|
|
||||||
|
# let cmake know it is supposed to use it
|
||||||
|
ADD_DEFINITIONS(-DCMAKE_BUILD_WITH_CMAKE)
|
||||||
|
|
||||||
|
#
|
||||||
|
# Sources for CMakeLib
|
||||||
|
#
|
||||||
SET(SRCS
|
SET(SRCS
|
||||||
cmBootstrapCommands.cxx
|
cmBootstrapCommands.cxx
|
||||||
cmCacheManager.cxx
|
cmCacheManager.cxx
|
||||||
|
@ -68,18 +83,6 @@ SET(SRCS
|
||||||
cmakewizard.h
|
cmakewizard.h
|
||||||
)
|
)
|
||||||
|
|
||||||
# configure the .h file
|
|
||||||
CONFIGURE_FILE(
|
|
||||||
${CMake_SOURCE_DIR}/Source/cmConfigure.cmake.h.in
|
|
||||||
${CMake_BINARY_DIR}/Source/cmConfigure.h )
|
|
||||||
|
|
||||||
# add the include path to find the .h
|
|
||||||
INCLUDE_DIRECTORIES(${CMake_BINARY_DIR}/Source)
|
|
||||||
INCLUDE_DIRECTORIES(${CMake_SOURCE_DIR}/Source)
|
|
||||||
|
|
||||||
# let cmake know it is supposed to use it
|
|
||||||
ADD_DEFINITIONS(-DCMAKE_BUILD_WITH_CMAKE)
|
|
||||||
|
|
||||||
# Kdevelop only works on UNIX and not windows
|
# Kdevelop only works on UNIX and not windows
|
||||||
IF(UNIX)
|
IF(UNIX)
|
||||||
SET(SRCS ${SRCS}
|
SET(SRCS ${SRCS}
|
||||||
|
@ -119,21 +122,21 @@ ENDIF (WIN32)
|
||||||
# create a library used by the command line and the GUI
|
# create a library used by the command line and the GUI
|
||||||
ADD_LIBRARY(CMakeLib ${SRCS})
|
ADD_LIBRARY(CMakeLib ${SRCS})
|
||||||
TARGET_LINK_LIBRARIES(CMakeLib cmsys cmexpat cmzlib)
|
TARGET_LINK_LIBRARIES(CMakeLib cmsys cmexpat cmzlib)
|
||||||
|
IF (UNIX)
|
||||||
|
TARGET_LINK_LIBRARIES(CMakeLib ${CMAKE_DL_LIBS})
|
||||||
|
ENDIF (UNIX)
|
||||||
|
IF(CMAKE_BUILD_ON_VISUAL_STUDIO)
|
||||||
|
# On Visual Studio we need rpcrt4.lib for cmVisualStudio7 generator.
|
||||||
|
TARGET_LINK_LIBRARIES(CMakeLib rpcrt4.lib)
|
||||||
|
ENDIF(CMAKE_BUILD_ON_VISUAL_STUDIO)
|
||||||
|
|
||||||
# always link in the library
|
#
|
||||||
# the library is found here
|
# CTestLib
|
||||||
LINK_DIRECTORIES(${CMake_BINARY_DIR}/Source)
|
#
|
||||||
|
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/Source/CTest)
|
||||||
IF(CMAKE_BUILD_MFC_DIALOG)
|
#
|
||||||
LINK_LIBRARIES( rpcrt4.lib )
|
# Sources for CTestLib
|
||||||
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)
|
|
||||||
|
|
||||||
SET(CMTEST_SRCS cmCTest.cxx
|
SET(CMTEST_SRCS cmCTest.cxx
|
||||||
CTest/cmCTestGenericHandler.cxx
|
CTest/cmCTestGenericHandler.cxx
|
||||||
CTest/cmCTestBuildHandler.cxx
|
CTest/cmCTestBuildHandler.cxx
|
||||||
|
@ -151,18 +154,27 @@ SET(CMTEST_SRCS cmCTest.cxx
|
||||||
CTest/cmCTestSubmit.cxx
|
CTest/cmCTestSubmit.cxx
|
||||||
)
|
)
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/Source/CTest)
|
# Build CTestLib
|
||||||
|
ADD_LIBRARY(CTestLib ${CMTEST_SRCS})
|
||||||
IF (UNIX)
|
TARGET_LINK_LIBRARIES(CTestLib CMakeLib ${CMAKE_CURL_LIBRARIES})
|
||||||
TARGET_LINK_LIBRARIES(CMakeLib ${CMAKE_DL_LIBS})
|
|
||||||
ENDIF (UNIX)
|
|
||||||
|
|
||||||
|
# Build CMake executable
|
||||||
|
ADD_EXECUTABLE(cmake cmakemain.cxx)
|
||||||
TARGET_LINK_LIBRARIES(cmake CMakeLib)
|
TARGET_LINK_LIBRARIES(cmake CMakeLib)
|
||||||
|
ADD_EXECUTABLE(DumpDocumentation cmDumpDocumentation)
|
||||||
TARGET_LINK_LIBRARIES(DumpDocumentation CMakeLib)
|
TARGET_LINK_LIBRARIES(DumpDocumentation CMakeLib)
|
||||||
|
|
||||||
ADD_EXECUTABLE(ctest ctest.cxx ${CMTEST_SRCS})
|
# Build special executable for running programs on Windows 98
|
||||||
TARGET_LINK_LIBRARIES(ctest CMakeLib ${CMAKE_CURL_LIBRARIES})
|
IF(WIN32)
|
||||||
|
ADD_EXECUTABLE(cmw9xcom cmw9xcom.cxx)
|
||||||
|
TARGET_LINK_LIBRARIES(cmw9xcom CMakeLib)
|
||||||
|
ENDIF(WIN32)
|
||||||
|
|
||||||
|
# Build CTest executable
|
||||||
|
ADD_EXECUTABLE(ctest ctest.cxx)
|
||||||
|
TARGET_LINK_LIBRARIES(ctest CTestLib)
|
||||||
|
|
||||||
|
# Curses GUI
|
||||||
IF (UNIX)
|
IF (UNIX)
|
||||||
INCLUDE (${CMake_SOURCE_DIR}/Modules/FindCurses.cmake OPTIONAL)
|
INCLUDE (${CMake_SOURCE_DIR}/Modules/FindCurses.cmake OPTIONAL)
|
||||||
IF (CURSES_LIBRARY)
|
IF (CURSES_LIBRARY)
|
||||||
|
@ -170,12 +182,20 @@ IF (UNIX)
|
||||||
ENDIF (CURSES_LIBRARY)
|
ENDIF (CURSES_LIBRARY)
|
||||||
ENDIF (UNIX)
|
ENDIF (UNIX)
|
||||||
|
|
||||||
OPTION(CMAKE_BUILD_WX_DIALOG "Build wxWindows dialog for CMake" FALSE)
|
# MFC GUI
|
||||||
|
# MFC libraries are only available on Visual Studio
|
||||||
|
IF(CMAKE_BUILD_ON_VISUAL_STUDIO)
|
||||||
|
SUBDIRS(MFCDialog)
|
||||||
|
ENDIF(CMAKE_BUILD_ON_VISUAL_STUDIO)
|
||||||
|
|
||||||
|
# WX Widgets GUI
|
||||||
|
OPTION(CMAKE_BUILD_WX_DIALOG "Build wxWidgets dialog for CMake" FALSE)
|
||||||
MARK_AS_ADVANCED(CMAKE_BUILD_WX_DIALOG)
|
MARK_AS_ADVANCED(CMAKE_BUILD_WX_DIALOG)
|
||||||
IF(CMAKE_BUILD_WX_DIALOG)
|
IF(CMAKE_BUILD_WX_DIALOG)
|
||||||
SUBDIRS(WXDialog)
|
SUBDIRS(WXDialog)
|
||||||
ENDIF(CMAKE_BUILD_WX_DIALOG)
|
ENDIF(CMAKE_BUILD_WX_DIALOG)
|
||||||
|
|
||||||
|
# Testing
|
||||||
IF (NOT DART_ROOT)
|
IF (NOT DART_ROOT)
|
||||||
SET(MAKEPROGRAM ${CMAKE_MAKE_PROGRAM})
|
SET(MAKEPROGRAM ${CMAKE_MAKE_PROGRAM})
|
||||||
ENDIF (NOT DART_ROOT)
|
ENDIF (NOT DART_ROOT)
|
||||||
|
|
|
@ -81,7 +81,7 @@ IF(UNIX)
|
||||||
ENDIF(CURSES_LIBRARY)
|
ENDIF(CURSES_LIBRARY)
|
||||||
ENDIF(UNIX)
|
ENDIF(UNIX)
|
||||||
|
|
||||||
IF(CMAKE_BUILD_MFC_DIALOG)
|
IF(CMAKE_BUILD_ON_VISUAL_STUDIO)
|
||||||
SET(CMD ${CMD_DIR}/CMakeSetup${CMD_EXT})
|
SET(CMD ${CMD_DIR}/CMakeSetup${CMD_EXT})
|
||||||
ADD_CUSTOM_COMMAND(
|
ADD_CUSTOM_COMMAND(
|
||||||
TARGET documentation
|
TARGET documentation
|
||||||
|
@ -102,7 +102,7 @@ IF(CMAKE_BUILD_MFC_DIALOG)
|
||||||
${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(CMAKE_BUILD_MFC_DIALOG)
|
ENDIF(CMAKE_BUILD_ON_VISUAL_STUDIO)
|
||||||
|
|
||||||
# Drive documentation generation.
|
# Drive documentation generation.
|
||||||
ADD_CUSTOM_COMMAND(
|
ADD_CUSTOM_COMMAND(
|
||||||
|
|
Loading…
Reference in New Issue