summaryrefslogtreecommitdiff
path: root/gnu/packages/patches
diff options
context:
space:
mode:
authorCyril Roelandt <tipecaml@gmail.com>2013-03-12 04:40:00 +0100
committercyril <cyril@oldie>2013-03-21 19:53:29 +0100
commitb6a64843c6d651903bf6bee4cd029f5ac48c0858 (patch)
treea036058c33e5ec8f7aadd849a21d30bfa3e94032 /gnu/packages/patches
parent9776ebb2a50234c293d4c4a699b81a2ee3543367 (diff)
gnu: Add cmake.
* gnu/packages/cmake.scm: New file. * gnu/packages/patches/cmake-fix-tests.patch: New file. * Makefile.am: Add them.
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r--gnu/packages/patches/cmake-fix-tests.patch45
1 files changed, 45 insertions, 0 deletions
diff --git a/gnu/packages/patches/cmake-fix-tests.patch b/gnu/packages/patches/cmake-fix-tests.patch
new file mode 100644
index 0000000000..ae28ca336b
--- /dev/null
+++ b/gnu/packages/patches/cmake-fix-tests.patch
@@ -0,0 +1,45 @@
+--- Tests/CMakeLists.txt 2013-03-20 22:57:13.000000000 +0100
++++ Tests/CMakeLists.txt 2013-03-20 22:58:02.000000000 +0100
+@@ -1706,16 +1706,17 @@
+ PASS_REGULAR_EXPRESSION "Could not find executable"
+ FAIL_REGULAR_EXPRESSION "SegFault")
+
+- configure_file(
+- "${CMake_SOURCE_DIR}/Tests/CTestTestUpload/test.cmake.in"
+- "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake"
+- @ONLY ESCAPE_QUOTES)
+- add_test(CTestTestUpload ${CMAKE_CTEST_COMMAND}
+- -S "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake" -V
+- --output-log "${CMake_BINARY_DIR}/Tests/CTestTestUpload/testOut.log"
+- )
+- set_tests_properties(CTestTestUpload PROPERTIES
+- PASS_REGULAR_EXPRESSION "Upload\\.xml")
++# This test requires network connectivity: skip it.
++# configure_file(
++# "${CMake_SOURCE_DIR}/Tests/CTestTestUpload/test.cmake.in"
++# "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake"
++# @ONLY ESCAPE_QUOTES)
++# add_test(CTestTestUpload ${CMAKE_CTEST_COMMAND}
++# -S "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake" -V
++# --output-log "${CMake_BINARY_DIR}/Tests/CTestTestUpload/testOut.log"
++# )
++# set_tests_properties(CTestTestUpload PROPERTIES
++# PASS_REGULAR_EXPRESSION "Upload\\.xml")
+
+ configure_file(
+ "${CMake_SOURCE_DIR}/Tests/CTestTestConfigFileInBuildDir/test1.cmake.in"
+--- Utilities/cmcurl/CMakeLists.txt 2013-03-20 22:57:13.000000000 +0100
++++ Utilities/cmcurl/CMakeLists.txt 2013-03-20 23:08:41.000000000 +0100
+@@ -729,8 +729,9 @@
+ ADD_EXECUTABLE(LIBCURL Testing/curltest.c)
+ TARGET_LINK_LIBRARIES(LIBCURL cmcurl ${CMAKE_DL_LIBS})
+
+-IF(CMAKE_CURL_TEST_URL)
+- ADD_TEST(curl LIBCURL ${CMAKE_CURL_TEST_URL})
+-ENDIF(CMAKE_CURL_TEST_URL)
++# This test requires network connectivity: skip it.
++#IF(CMAKE_CURL_TEST_URL)
++# ADD_TEST(curl LIBCURL ${CMAKE_CURL_TEST_URL})
++#ENDIF(CMAKE_CURL_TEST_URL)
+
+ INSTALL(FILES COPYING DESTINATION ${CMake_DOC_DEST}/cmcurl)