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

ENH: More cleanups and start linking ctest to XML-RPC

Browse Source
This commit is contained in:
Andy Cedilnik 2005-03-04 14:27:32 -05:00
parent 89f603b620
commit ef282e2a7f
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -64,16 +64,22 @@ SUBDIRS(Source/kwsys)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Build Curl library for CTest. # Build Curl library for CTest.
SUBDIRS(Source/CTest/Curl) SUBDIRS(Source/CTest/Curl)
SET(CMAKE_CURL_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/Source/CTest/Curl")
SET(CMAKE_CURL_LIBRARIES "Curl")
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Build expat library for CMake and CTest. # Build expat library for CMake and CTest.
INCLUDE_DIRECTORIES(${CMake_BINARY_DIR}/Utilities) INCLUDE_DIRECTORIES(${CMake_BINARY_DIR}/Utilities)
SUBDIRS(Utilities/cmexpat Utilities/cmzlib)
SET(CMAKE_EXPAT_INCLUDES "${CMAKE_CURRENT_BINARY_DIR}/Utilities/cmexpat") SET(CMAKE_EXPAT_INCLUDES "${CMAKE_CURRENT_BINARY_DIR}/Utilities/cmexpat")
SET(CMAKE_EXPAT_LIBRARIES "cmexpat") SET(CMAKE_EXPAT_LIBRARIES "cmexpat")
SET(CMAKE_CURL_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/Source/CTest/Curl")
SET(CMAKE_CURL_LIBRARIES "Curl")
SUBDIRS(Utilities/cmexpat Utilities/cmzlib)
SUBDIRS(Utilities/cmxmlrpc) SUBDIRS(Utilities/cmxmlrpc)
SET(CMAKE_XMLRPC_INCLUDES
"${CMAKE_CURRENT_SOURCE_DIR}/Utilities/cmxmlrpc"
"${CMAKE_CURRENT_BINARY_DIR}/Utilities/cmxmlrpc"
)
SET(CMAKE_XMLRPC_LIBRARIES "cmXMLRPC")
IF (UNIX) IF (UNIX)
INCLUDE (${CMake_SOURCE_DIR}/Modules/FindCurses.cmake OPTIONAL) INCLUDE (${CMake_SOURCE_DIR}/Modules/FindCurses.cmake OPTIONAL)

20
Source/CMakeLists.txt
View File

@ -2,12 +2,15 @@ CMAKE_MINIMUM_REQUIRED(VERSION 1.5)
# configure the .h file # configure the .h file
CONFIGURE_FILE( CONFIGURE_FILE(
${CMake_SOURCE_DIR}/Source/cmConfigure.cmake.h.in "${CMake_SOURCE_DIR}/Source/cmConfigure.cmake.h.in"
${CMake_BINARY_DIR}/Source/cmConfigure.h ) "${CMake_BINARY_DIR}/Source/cmConfigure.h"
)
# add the include path to find the .h # add the include path to find the .h
INCLUDE_DIRECTORIES(${CMake_BINARY_DIR}/Source) INCLUDE_DIRECTORIES(
INCLUDE_DIRECTORIES(${CMake_SOURCE_DIR}/Source) "${CMake_BINARY_DIR}/Source"
"${CMake_SOURCE_DIR}/Source"
)
# let cmake know it is supposed to use it # let cmake know it is supposed to use it
ADD_DEFINITIONS(-DCMAKE_BUILD_WITH_CMAKE) ADD_DEFINITIONS(-DCMAKE_BUILD_WITH_CMAKE)
@ -121,7 +124,7 @@ 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 ${CMAKE_EXPAT_LIBRARIES} cmzlib)
IF (UNIX) IF (UNIX)
TARGET_LINK_LIBRARIES(CMakeLib ${CMAKE_DL_LIBS}) TARGET_LINK_LIBRARIES(CMakeLib ${CMAKE_DL_LIBS})
ENDIF (UNIX) ENDIF (UNIX)
@ -133,7 +136,10 @@ ENDIF(CMAKE_BUILD_ON_VISUAL_STUDIO)
# #
# CTestLib # CTestLib
# #
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/Source/CTest) INCLUDE_DIRECTORIES(
"${CMAKE_SOURCE_DIR}/Source/CTest"
${CMAKE_XMLRPC_INCLUDES}
)
# #
# Sources for CTestLib # Sources for CTestLib
# #
@ -156,7 +162,7 @@ SET(CMTEST_SRCS cmCTest.cxx
# Build CTestLib # Build CTestLib
ADD_LIBRARY(CTestLib ${CMTEST_SRCS}) ADD_LIBRARY(CTestLib ${CMTEST_SRCS})
TARGET_LINK_LIBRARIES(CTestLib CMakeLib ${CMAKE_CURL_LIBRARIES}) TARGET_LINK_LIBRARIES(CTestLib CMakeLib ${CMAKE_CURL_LIBRARIES} ${CMAKE_XMLRPC_LIBRARIES})
# Build CMake executable # Build CMake executable
ADD_EXECUTABLE(cmake cmakemain.cxx) ADD_EXECUTABLE(cmake cmakemain.cxx)