From 8cb8371011a8920f5b137ba6bec463d37262a393 Mon Sep 17 00:00:00 2001 From: Benoit Neil Date: Mon, 6 Apr 2009 22:45:17 +0000 Subject: Made the CMake scripts read Makefile.inc. Needs testing I guess. --- src/CMakeLists.txt | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) (limited to 'src/CMakeLists.txt') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e0e7a7855..8688e56d5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -8,22 +8,8 @@ IF (NOT HUGEHELP_C_FILE) FILE(WRITE hugehelp.c "/* built-in manual is disabled, blank function */\n#include \"hugehelp.h\"\nvoid hugehelp(void) {}") ENDIF() -SET(CURLX_SOURCE - ${CURL_SOURCE_DIR}/lib/strtoofft.c - ${CURL_SOURCE_DIR}/lib/strdup.c - ${CURL_SOURCE_DIR}/lib/rawstr.c -) - -SET(CURL_SOURCE - main.c hugehelp.c urlglob.c writeout.c writeenv.c - getpass.c homedir.c curlutil.c -) - -SET(CURL_HEADERS - hugehelp.h setup.h config-win32.h config-mac.h - config-riscos.h urlglob.h version.h - writeout.h writeenv.h getpass.h homedir.h curlutil.h -) +TRANSFORM_MAKEFILE_INC("Makefile.inc" "${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake") +INCLUDE(${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake) IF(MSVC) LIST(APPEND CURL_SOURCE curl.rc) @@ -31,13 +17,12 @@ ENDIF() ADD_EXECUTABLE( ${EXE_NAME} - ${CURL_HEADERS} - ${CURL_SOURCE} ${CURLX_SOURCE} + ${curl_SOURCES} ) -SOURCE_GROUP("cURLX source files" FILES ${CURLX_SOURCE}) -SOURCE_GROUP("cURL source files" FILES ${CURL_SOURCE}) -SOURCE_GROUP("cURL header files" FILES ${CURL_HEADERS}) +SOURCE_GROUP("cURLX source files" FILES ${CURLX_ONES}) +SOURCE_GROUP("cURL source files" FILES ${CURL_SOURCES}) +SOURCE_GROUP("cURL header files" FILES ${CURL_HFILES}) INCLUDE_DIRECTORIES( ${CURL_SOURCE_DIR}/lib # To be able to reach "setup_once.h" -- cgit v1.2.3