Date: Wed, 31 Dec 2014 17:41:04 +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: r375906 - head/www/hiawatha/files Message-ID: <201412311741.sBVHf4pp067438@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Wed Dec 31 17:41:04 2014 New Revision: 375906 URL: https://svnweb.freebsd.org/changeset/ports/375906 QAT: https://qat.redports.org/buildarchive/r375906/ Log: Add a patch (sent upstream) to fix the creation of empty directories with CMake 3.1.0. No PORTREVISION bump, as there should not be any functional changes. Tested with CMake 3.0.2. Added: head/www/hiawatha/files/patch-CMakeLists.txt (contents, props changed) Added: head/www/hiawatha/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/hiawatha/files/patch-CMakeLists.txt Wed Dec 31 17:41:04 2014 (r375906) @@ -0,0 +1,28 @@ +Submitted upstream: https://github.com/hsleisink/hiawatha/pull/20 + +commit 4f61342f9f6ff46fbb8b4dc5646c9f0b15809bef +Author: Raphael Kubo da Costa <rakuco@FreeBSD.org> +Date: Wed Dec 31 19:31:22 2014 +0200 + + Make the INSTALL(DIRECTORY empty) calls work with CMake >= 3.1.0. + + Since CMake 3.1.0, ${LOG_DIR}, ${PID_DIR} and ${WORK_DIR} were no longer + being created because the regular expression does not match anything and + CMake's behavior changed in a way that those directories would not be + created before filtering the match list anymore. + + Instead, just call INSTALL(DIRECTORY) with an empty source, which works + with all CMake versions currently supported. + +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -172,6 +172,6 @@ endforeach() + install(FILES extra/index.html DESTINATION ${WEBROOT_DIR}) + + # Create directories +-install(DIRECTORY empty DESTINATION ${LOG_DIR} PATTERN "empty" EXCLUDE) +-install(DIRECTORY empty DESTINATION ${PID_DIR} PATTERN "empty" EXCLUDE) +-install(DIRECTORY empty DESTINATION ${WORK_DIR} PATTERN "empty" EXCLUDE) ++install(DIRECTORY DESTINATION ${LOG_DIR}) ++install(DIRECTORY DESTINATION ${PID_DIR}) ++install(DIRECTORY DESTINATION ${WORK_DIR})
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412311741.sBVHf4pp067438>