diff options
| author | Benoit Neil <suky0001@free.fr> | 2009-04-07 21:59:15 +0000 |
|---|---|---|
| committer | Benoit Neil <suky0001@free.fr> | 2009-04-07 21:59:15 +0000 |
| commit | e9dd0998706a0ce099826b982bbb1671909fe026 (patch) | |
| tree | 89947e0e7475380f446f0387a9b74d86d4ff9977 /CMakeLists.txt | |
| parent | 070d89a5610070e5af7178481bcaacce24bd9af2 (diff) | |
Added missing tests in CMake, added Makefile.inc for tests (+ use in CMake scripts), and fixed a missing define under windows in a test source file.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 781f27dfd..09f7325b2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -786,11 +786,15 @@ ENDFUNCTION() # Ugly (but functional) way to include "Makefile.inc" by transforming it (= regenerate it). FUNCTION(TRANSFORM_MAKEFILE_INC INPUT_FILE OUTPUT_FILE) FILE(READ ${INPUT_FILE} MAKEFILE_INC_TEXT) - STRING(REPLACE "$(top_srcdir)" "\${CURL_SOURCE_DIR}" MAKEFILE_INC_TEXT ${MAKEFILE_INC_TEXT}) + STRING(REPLACE "$(top_srcdir)" "\${CURL_SOURCE_DIR}" MAKEFILE_INC_TEXT ${MAKEFILE_INC_TEXT}) + STRING(REPLACE "$(top_builddir)" "\${CURL_BINARY_DIR}" MAKEFILE_INC_TEXT ${MAKEFILE_INC_TEXT}) + STRING(REGEX REPLACE "\\\\\n" "§!§" MAKEFILE_INC_TEXT ${MAKEFILE_INC_TEXT}) STRING(REGEX REPLACE "([a-zA-Z_][a-zA-Z0-9_]*)[\t ]*=[\t ]*([^\n]*\n)" "SET(\\1 \\2)\n" MAKEFILE_INC_TEXT ${MAKEFILE_INC_TEXT}) STRING(REPLACE "§!§" "\n" MAKEFILE_INC_TEXT ${MAKEFILE_INC_TEXT}) - STRING(REGEX REPLACE "\\$\\(([a-zA-Z_][a-zA-Z0-9_]*)\\)" "\${\\1}" MAKEFILE_INC_TEXT ${MAKEFILE_INC_TEXT}) + + STRING(REGEX REPLACE "\\$\\(([a-zA-Z_][a-zA-Z0-9_]*)\\)" "\${\\1}" MAKEFILE_INC_TEXT ${MAKEFILE_INC_TEXT}) # Replace $() with ${} + STRING(REGEX REPLACE "@([a-zA-Z_][a-zA-Z0-9_]*)@" "\${\\1}" MAKEFILE_INC_TEXT ${MAKEFILE_INC_TEXT}) # Replace @@ with ${}, even if that may not be read by CMake scripts. FILE(WRITE ${OUTPUT_FILE} ${MAKEFILE_INC_TEXT}) ### BUGGY METHOD 1 |