From owner-svn-ports-all@freebsd.org Fri Apr 3 08:26:02 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DAB9F279082; Fri, 3 Apr 2020 08:26:02 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48ttLK21L8z450m; Fri, 3 Apr 2020 08:26:01 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 01C6B1069; Fri, 3 Apr 2020 08:16:30 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0338GUm0092043; Fri, 3 Apr 2020 08:16:30 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0338GUuT092039; Fri, 3 Apr 2020 08:16:30 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <202004030816.0338GUuT092039@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Fri, 3 Apr 2020 08:16:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r530474 - in head/graphics/alembic: . files X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: in head/graphics/alembic: . files X-SVN-Commit-Revision: 530474 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Apr 2020 08:26:03 -0000 Author: danfe Date: Fri Apr 3 08:16:29 2020 New Revision: 530474 URL: https://svnweb.freebsd.org/changeset/ports/530474 Log: Unbreak the build when previous version of the port is installed by preventing system-wide include directories being injected into the global CMake state and thus taking precedence over target's include directories. Hook provided test suite to our framework while here. PR: 245298 Added: head/graphics/alembic/files/patch-lib_Alembic_AbcCoreHDF5_Tests_CMakeLists.txt (contents, props changed) Modified: head/graphics/alembic/Makefile head/graphics/alembic/files/patch-CMakeLists.txt Modified: head/graphics/alembic/Makefile ============================================================================== --- head/graphics/alembic/Makefile Fri Apr 3 08:16:00 2020 (r530473) +++ head/graphics/alembic/Makefile Fri Apr 3 08:16:29 2020 (r530474) @@ -27,4 +27,7 @@ HDF5_CMAKE_ON= -DUSE_HDF5:BOOL=ON PLIST_FILES= lib/libAlembic.so.${PORTVERSION} \ lib/libAlembic.so.${PORTVERSION:R} +do-test: + @cd ${TEST_WRKSRC} && ctest -C ${CMAKE_BUILD_TYPE} ${_MAKE_JOBS} + .include Modified: head/graphics/alembic/files/patch-CMakeLists.txt ============================================================================== --- head/graphics/alembic/files/patch-CMakeLists.txt Fri Apr 3 08:16:00 2020 (r530473) +++ head/graphics/alembic/files/patch-CMakeLists.txt Fri Apr 3 08:16:29 2020 (r530474) @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2017-03-24 00:18:21 UTC +--- CMakeLists.txt.orig 2019-10-26 04:47:57 UTC +++ CMakeLists.txt -@@ -111,7 +111,7 @@ IF ("${CMAKE_SYSTEM_NAME}" MATCHES "Darw +@@ -112,7 +112,7 @@ IF ("${CMAKE_SYSTEM_NAME}" MATCHES "Darwin") ENDIF() SET(LINUX FALSE) @@ -9,7 +9,7 @@ SET(LINUX TRUE) ENDIF() -@@ -140,9 +140,6 @@ IF ("${CMAKE_BUILD_TYPE}" MATCHES "Debug +@@ -141,9 +141,6 @@ IF ("${CMAKE_BUILD_TYPE}" MATCHES "Debug") ENDIF() ELSEIF ("${CMAKE_BUILD_TYPE}" MATCHES "Release") ADD_DEFINITIONS(-DNDEBUG=1 -UDEBUG) @@ -19,3 +19,24 @@ ENDIF() IF (NOT ${WINDOWS}) +@@ -228,14 +225,18 @@ ENDIF() + + # IlmBase + INCLUDE("./cmake/AlembicIlmBase.cmake") +-INCLUDE_DIRECTORIES(${ALEMBIC_ILMBASE_INCLUDE_DIRECTORY}) ++# XXX: do not pollute global state: include directories correctly added ++# via TARGET_INCLUDE_DIRECTORIES in the `lib/Alembic/CMakeLists.txt' ++#INCLUDE_DIRECTORIES(${ALEMBIC_ILMBASE_INCLUDE_DIRECTORY}) + + # HDF5 + IF (USE_HDF5) + FIND_PACKAGE(ZLIB REQUIRED) + SET(ALEMBIC_WITH_HDF5 "1") + INCLUDE("./cmake/AlembicHDF5.cmake") +- INCLUDE_DIRECTORIES(${HDF5_INCLUDE_DIRS}) ++ # XXX: do not pollute global state: include directories correctly added ++ # via TARGET_INCLUDE_DIRECTORIES in the `lib/Alembic/CMakeLists.txt' ++ #INCLUDE_DIRECTORIES(${HDF5_INCLUDE_DIRS}) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DH5_USE_18_API") + ENDIF() + Added: head/graphics/alembic/files/patch-lib_Alembic_AbcCoreHDF5_Tests_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/alembic/files/patch-lib_Alembic_AbcCoreHDF5_Tests_CMakeLists.txt Fri Apr 3 08:16:29 2020 (r530474) @@ -0,0 +1,12 @@ +--- lib/Alembic/AbcCoreHDF5/Tests/CMakeLists.txt.orig 2019-10-26 04:47:57 UTC ++++ lib/Alembic/AbcCoreHDF5/Tests/CMakeLists.txt +@@ -33,7 +33,8 @@ + ## + ##-***************************************************************************** + +-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/lib ${PROJECT_BINARY_DIR}/lib) ++INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/lib ${PROJECT_BINARY_DIR}/lib ++ ${HDF5_INCLUDE_DIRS}) + + SET(CXX_FILES + ArchiveTests.cpp