diff options
| author | Christoph Moench-Tegeder <cmt@FreeBSD.org> | 2019-06-16 20:09:13 +0000 |
|---|---|---|
| committer | Christoph Moench-Tegeder <cmt@FreeBSD.org> | 2019-06-16 20:09:13 +0000 |
| commit | 7fe1dd4f209e95a97f8a0de40b8a74e6e25f6265 (patch) | |
| tree | 4014e5398419d0bd1af86cb0436cc4054434b16f | |
| parent | 68ff9761a26783001ea1f067a0f390f2bdd1395e (diff) | |
| download | ports-7fe1dd4f209e95a97f8a0de40b8a74e6e25f6265.tar.gz ports-7fe1dd4f209e95a97f8a0de40b8a74e6e25f6265.zip | |
Notes
| -rw-r--r-- | cad/freecad/Makefile | 1 | ||||
| -rw-r--r-- | cad/freecad/files/patch-CMakeLists.txt | 31 |
2 files changed, 32 insertions, 0 deletions
diff --git a/cad/freecad/Makefile b/cad/freecad/Makefile index b26cd118b23f..a4108e7ad6f5 100644 --- a/cad/freecad/Makefile +++ b/cad/freecad/Makefile @@ -2,6 +2,7 @@ PORTNAME= FreeCAD DISTVERSION= 0.18.2 +PORTREVISION= 1 # use these for bugfixes/snapshots # DISTVERSION= 0.18-16093 # git rev-list --count # DISTVERSIONSUFFIX= -g690774c0e diff --git a/cad/freecad/files/patch-CMakeLists.txt b/cad/freecad/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..a36ebff62bb5 --- /dev/null +++ b/cad/freecad/files/patch-CMakeLists.txt @@ -0,0 +1,31 @@ +--- CMakeLists.txt.orig 2019-06-16 18:08:47 UTC ++++ CMakeLists.txt +@@ -989,6 +989,13 @@ endif() + endif() + endif() + ++ # pyside2 changed it's cmake files, this is the dance we have ++ # to dance to be compatible with the old and the new versions ++ if(SHIBOKEN_PYTHON_INCLUDE_DIRS AND NOT SHIBOKEN_INCLUDE_DIR) ++ get_property(SHIBOKEN_INCLUDE_DIR TARGET Shiboken2::libshiboken PROPERTY INTERFACE_INCLUDE_DIRECTORIES) ++ get_property(SHIBOKEN_LIBRARY TARGET Shiboken2::libshiboken PROPERTY IMPORTED_LOCATION_RELEASE) ++ endif(SHIBOKEN_PYTHON_INCLUDE_DIRS AND NOT SHIBOKEN_INCLUDE_DIR) ++ + if(NOT SHIBOKEN_INCLUDE_DIR) + MESSAGE("====================\n" + "shiboken2 not found.\n" +@@ -996,6 +1003,14 @@ endif() + endif(NOT SHIBOKEN_INCLUDE_DIR) + + find_package(PySide2 QUIET)# REQUIRED ++ ++ # pyside2 changed it's cmake files, this is the dance we have ++ # to dance to be compatible with the old and the new versions ++ if(NOT PYSIDE_INCLUDE_DIR) ++ get_property(PYSIDE_INCLUDE_DIR TARGET PySide2::pyside2 PROPERTY INTERFACE_INCLUDE_DIRECTORIES) ++ get_property(PYSIDE_LIBRARY TARGET PySide2::pyside2 PROPERTY IMPORTED_LOCATION_RELEASE) ++ endif(NOT PYSIDE_INCLUDE_DIR) ++ + if(NOT PYSIDE_INCLUDE_DIR) + MESSAGE("==================\n" + "PySide2 not found.\n" |