Index: head/graphics/alembic/Makefile =================================================================== --- head/graphics/alembic/Makefile (revision 530473) +++ head/graphics/alembic/Makefile (revision 530474) @@ -1,30 +1,33 @@ # Created by: Alexey Dokuchaev # $FreeBSD$ PORTNAME= alembic PORTVERSION= 1.7.12 CATEGORIES= graphics MAINTAINER= danfe@FreeBSD.org COMMENT= Open framework for storing and sharing graphic scene data LICENSE= BSD3CLAUSE LIB_DEPENDS= libImath.so:graphics/ilmbase USES= cmake compiler:c++11-lang USE_CXXSTD= c++11 USE_GITHUB= yes USE_LDCONFIG= yes OPTIONS_DEFINE= HDF5 OPTIONS_DEFAULT= HDF5 OPTIONS_SUB= yes HDF5_LIB_DEPENDS= libhdf5.so:science/hdf5 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 Index: head/graphics/alembic/files/patch-CMakeLists.txt =================================================================== --- head/graphics/alembic/files/patch-CMakeLists.txt (revision 530473) +++ head/graphics/alembic/files/patch-CMakeLists.txt (revision 530474) @@ -1,21 +1,42 @@ ---- 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) -IF ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux") +IF ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux|FreeBSD") 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) - IF (NOT WINDOWS) - ADD_DEFINITIONS(-O3) - ENDIF() 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() + Index: head/graphics/alembic/files/patch-lib_Alembic_AbcCoreHDF5_Tests_CMakeLists.txt =================================================================== --- head/graphics/alembic/files/patch-lib_Alembic_AbcCoreHDF5_Tests_CMakeLists.txt (nonexistent) +++ head/graphics/alembic/files/patch-lib_Alembic_AbcCoreHDF5_Tests_CMakeLists.txt (revision 530474) @@ -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 Property changes on: head/graphics/alembic/files/patch-lib_Alembic_AbcCoreHDF5_Tests_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property