Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 26 Mar 2017 20:51:30 +0000 (UTC)
From:      Raphael Kubo da Costa <rakuco@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r436989 - head/graphics/libkscreen/files
Message-ID:  <201703262051.v2QKpULW077753@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rakuco
Date: Sun Mar 26 20:51:30 2017
New Revision: 436989
URL: https://svnweb.freebsd.org/changeset/ports/436989

Log:
  Add patch to fix `make configure'.
  
  The x11/kdelibs4 update from r436971 made the CMake code stricter, which was
  making libkscreen fail in `make configure' where CMake used to just show a
  warning:
  
  CMake Error at tests/CMakeLists.txt:9 (add_test):
    add_test given test name "testscreenconfig" which already exists in this
    directory.
  Call Stack (most recent call first):
    tests/CMakeLists.txt:13 (KSCREEN_TESTS)

Added:
  head/graphics/libkscreen/files/patch-tests_CMakeLists.txt   (contents, props changed)

Added: head/graphics/libkscreen/files/patch-tests_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/libkscreen/files/patch-tests_CMakeLists.txt	Sun Mar 26 20:51:30 2017	(r436989)
@@ -0,0 +1,19 @@
+kde4_add_unit_test() alredy calls add_test().
+
+Avoids errors such as:
+CMake Error at tests/CMakeLists.txt:9 (add_test):
+  add_test given test name "testscreenconfig" which already exists in this
+  directory.
+Call Stack (most recent call first):
+  tests/CMakeLists.txt:13 (KSCREEN_TESTS)
+--- tests/CMakeLists.txt.orig	2017-03-26 22:46:03.553275000 +0200
++++ tests/CMakeLists.txt	2017-03-26 22:46:08.261918000 +0200
+@@ -6,7 +6,7 @@
+         include_directories(${QT_INCLUDES} ${KDE4_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR} ${X11_Xrandr_INCLUDE_PATH})
+         kde4_add_unit_test(${_testname} ${_testname}.cpp ${_testname}.moc)
+         target_link_libraries(${_testname} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} kscreen)
+-        add_test(${_testname} ${CMAKE_CURRENT_BINARY_DIR}/${_testname})
++        # add_test(${_testname} ${CMAKE_CURRENT_BINARY_DIR}/${_testname})
+     endforeach(_testname)
+ endmacro(KSCREEN_TESTS)
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703262051.v2QKpULW077753>