diff options
| author | Alexey Dokuchaev <danfe@FreeBSD.org> | 2020-04-03 08:16:29 +0000 |
|---|---|---|
| committer | Alexey Dokuchaev <danfe@FreeBSD.org> | 2020-04-03 08:16:29 +0000 |
| commit | 50feeabf18cefe9f05c0bc7633f750dc474febf5 (patch) | |
| tree | 611a7f00027ad0aa9f7f92f2b14ef22db4b18768 /graphics/alembic | |
| parent | 117c240918f59c894169bd4d16ab1d56cf47a10e (diff) | |
| download | ports-50feeabf18cefe9f05c0bc7633f750dc474febf5.tar.gz ports-50feeabf18cefe9f05c0bc7633f750dc474febf5.zip | |
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
Notes
Notes:
svn path=/head/; revision=530474
Diffstat (limited to 'graphics/alembic')
| -rw-r--r-- | graphics/alembic/Makefile | 3 | ||||
| -rw-r--r-- | graphics/alembic/files/patch-CMakeLists.txt | 27 | ||||
| -rw-r--r-- | graphics/alembic/files/patch-lib_Alembic_AbcCoreHDF5_Tests_CMakeLists.txt | 12 |
3 files changed, 39 insertions, 3 deletions
diff --git a/graphics/alembic/Makefile b/graphics/alembic/Makefile index 692ad19fff6b..737a0e59fdb1 100644 --- a/graphics/alembic/Makefile +++ b/graphics/alembic/Makefile @@ -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 <bsd.port.mk> diff --git a/graphics/alembic/files/patch-CMakeLists.txt b/graphics/alembic/files/patch-CMakeLists.txt index ec914f9506ff..01a20d330aa6 100644 --- a/graphics/alembic/files/patch-CMakeLists.txt +++ b/graphics/alembic/files/patch-CMakeLists.txt @@ -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() + diff --git a/graphics/alembic/files/patch-lib_Alembic_AbcCoreHDF5_Tests_CMakeLists.txt b/graphics/alembic/files/patch-lib_Alembic_AbcCoreHDF5_Tests_CMakeLists.txt new file mode 100644 index 000000000000..d9502a53731c --- /dev/null +++ b/graphics/alembic/files/patch-lib_Alembic_AbcCoreHDF5_Tests_CMakeLists.txt @@ -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 |