<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5448a392efe4cf167d5fa660a39f2b17cb407af2">https://github.com/macports/macports-ports/commit/5448a392efe4cf167d5fa660a39f2b17cb407af2</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 5448a39 libiio: update to 0.19
</span>5448a39 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5448a392efe4cf167d5fa660a39f2b17cb407af2
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Sat May 16 13:06:38 2020 -0400
<span style='display:block; white-space:pre;color:#404040;'> libiio: update to 0.19
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Deprecate the devel port in favor of the release port.
</span><span style='display:block; white-space:pre;color:#404040;'> Various fixups for the new release port to build and install cleanly.
</span>---
science/libiio/Portfile | 268 ++++++++++------------
science/libiio/files/patch-fix_build.devel.diff | 61 -----
science/libiio/files/patch-fix_build.release.diff | 73 +++---
3 files changed, 159 insertions(+), 243 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/libiio/Portfile b/science/libiio/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 870c001..b83b9c7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/libiio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/libiio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cmake 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span> PortGroup github 1.0
name libiio
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,19 +12,24 @@ long_description ${description}. The IIO subsystem is intended to provide sup
</span> license LGPL-2+
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport libiio-devel {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport libiio-devel {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # releases happen here often enough to not require this port
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ replaced_by libiio
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup obsolete 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # final version of the devel, with +1 rev bump
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20200110-3d582f2f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
if {${subport} eq ${name}} {
# release
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup analogdevicesinc libiio 0.18 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 5faff3b0ee29b077b21c013b6722d5e090017792 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 aa585c34ee536828add315d002458e4f8469867a8c4d2bffa4eda0de1956b168 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 201765
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # stealth update of some sort; remove at the next release
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dist_subdir ${name}/${version}_1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup analogdevicesinc libiio 0.19 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 e21e15a19ca9af2d597babd49151e3a993a21aeb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ab0ff9d373d3999f7269cab4a9bc13fdcd6b9113e2ddef0c521864c89494dc54 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 226022
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span>
long_description ${long_description} Provides the release, which is typically updated every few months to yearly.
# because I moved from a "devel" style 20190503 to a release style
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,167 +42,136 @@ if {${subport} eq ${name}} {
</span>
# additional arguments
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_INSTALL_MP_FRAMEWORKS_DIR=${frameworks_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup analogdevicesinc libiio 3d582f2ff01452c17df597fecaa548c419e107a1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20200110-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 fd3aa47aa030c739a0441402e00b2c7709f0efc6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 12a5f33da3335e08085a5dcc899732a7f9171834bc308c9b1dd29a4b59c1a157 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 203094
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description ${long_description} Provides the GIT master branch version, which is typically updated every few days to weeks.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # patch to fix install directory of the framework
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-fix_build.devel.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # additional arguments
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span> -DCMAKE_INSTALL_DOCDIR=${prefix}/share/doc/${github.project} \
-DOSX_INSTALL_FRAMEWORKSDIR=${prefix}/Library/Frameworks
<span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libxml2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libusb.dylib:libusb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:avahi \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:zlib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libiconv
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:doxygen
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# do VPATH (out of source tree) build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-cmake.out_of_source yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# remove top-level library path, such that internal libraries are used
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# instead of any already-installed ones.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.ldflags-delete -L${prefix}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# directory to install all CMake files; internal appends "uhd"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DAVAHI_CLIENT_LIBRARIES=${prefix}/lib/libavahi-client.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DAVAHI_COMMON_LIBRARIES=${prefix}/lib/libavahi-common.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DLIBLZMA_INCLUDE_DIR:PATH=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DLIBLZMA_LIBRARY:FILEPATH=${prefix}/lib/liblzma.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DLIBUSB_INCLUDE_DIR:PATH=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DLIBUSB_LIBRARIES:FILEPATH=${prefix}/lib/libusb-1.0.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DZLIB_INCLUDE_DIR:PATH=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DZLIB_LIBRARY_RELEASE:FILEPATH=${prefix}/lib/libz.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DOSX_PACKAGE=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DWITH_MATLAB_BINDINGS_API=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libxml2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/libusb.dylib:libusb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:avahi \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libiconv
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# specify the Python dependencies; these are checked for at configure,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# then used for building, but not at runtime.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:doxygen
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set pythons_suffixes {27 35 36 37 38}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # remove top-level library path, such that internal libraries are used
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # instead of any already-installed ones.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set pythons_ports {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach s ${pythons_suffixes} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend pythons_ports python${s}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-delete -L${prefix}/lib
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach s ${pythons_suffixes} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set p python${s}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set v [string index ${s} 0].[string index ${s} 1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set i [lsearch -exact ${pythons_ports} ${p}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set c [lreplace ${pythons_ports} ${i} ${i}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant ${p} description "Build ${name} using Python ${v}" conflicts {*}${c} ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # directory to install all CMake files; internal appends "uhd"
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# default to Py37 if not selected by the user
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set selected_python_no_dot 37
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach s ${pythons_suffixes} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset python${s}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set selected_python_no_dot ${s}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DAVAHI_CLIENT_LIBRARIES=${prefix}/lib/libavahi-client.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DAVAHI_COMMON_LIBRARIES=${prefix}/lib/libavahi-common.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DAVAHI_SERVICE_INSTALL_DIR=${prefix}/etc/avahi/services \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLIBLZMA_INCLUDE_DIR:PATH=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLIBLZMA_LIBRARY:FILEPATH=${prefix}/lib/liblzma.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLIBUSB_INCLUDE_DIR:PATH=${prefix}/include/libusb-1.0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLIBUSB_LIBRARIES:FILEPATH=${prefix}/lib/libusb-1.0.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DZLIB_INCLUDE_DIR:PATH=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DZLIB_LIBRARY_RELEASE:FILEPATH=${prefix}/lib/libz.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DOSX_PACKAGE=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_MATLAB_BINDINGS_API=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_BINDINGS=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # specify the Python dependencies; these are checked for at configure,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # then used for building, but not at runtime.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pythons_suffixes {27 35 36 37 38}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pythons_ports {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach s ${pythons_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend pythons_ports python${s}
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +python${selected_python_no_dot}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# make sure the default python variant wasn't
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# deselected without selecting another one
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set selected_python_no_dot ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach s ${pythons_suffixes} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset python${s}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set selected_python_no_dot ${s}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach s ${pythons_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set p python${s}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set v [string index ${s} 0].[string index ${s} 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set i [lsearch -exact ${pythons_ports} ${p}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set c [lreplace ${pythons_ports} ${i} ${i}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ${p} description "Build ${name} using Python ${v}" conflicts {*}${c} ""
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${selected_python_no_dot} eq ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set py_vars ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set final_s [lindex ${pythons_suffixes} end]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # default to Py37 if not selected by the user
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set selected_python_no_dot 37
</span> foreach s ${pythons_suffixes} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${s} eq ${final_s}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set py_vars "${py_vars}or "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set py_vars "${py_vars}+python${s}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${s} ne ${final_s}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set py_vars "${py_vars}, "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset python${s}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set selected_python_no_dot ${s}
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "\n\nYou must select one of the variants ${py_vars}.\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "Invalid variant selection"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +python${selected_python_no_dot}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set selected_python_with_dot [join [split ${selected_python_no_dot} ""] "."]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # make sure the default python variant wasn't
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # deselected without selecting another one
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set selected_python_no_dot ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach s ${pythons_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset python${s}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set selected_python_no_dot ${s}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set python_top_dir ${frameworks_dir}/Python.framework/Versions/${selected_python_with_dot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${selected_python_no_dot} eq ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set py_vars ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set final_s [lindex ${pythons_suffixes} end]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach s ${pythons_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${s} eq ${final_s}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set py_vars "${py_vars}or "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set py_vars "${py_vars}+python${s}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${s} ne ${final_s}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set py_vars "${py_vars}, "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "\n\nYou must select one of the variants ${py_vars}.\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "Invalid variant selection"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set python_name python${selected_python_with_dot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set selected_python_with_dot [join [split ${selected_python_no_dot} ""] "."]
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# required Python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_top_dir ${frameworks_dir}/Python.framework/Versions/${selected_python_with_dot}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:python${selected_python_no_dot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_name python${selected_python_with_dot}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# specify the Python version to use; currently depends on port version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # required Python
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_EXECUTABLE=${python_top_dir}/bin/${python_name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:python${selected_python_no_dot}
</span> configure.args-append \
-DPython_EXECUTABLE=${python_top_dir}/bin/${python_name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # move Python install to frameworks_dir for Python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set py_install_dir ${python_top_dir}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${py_install_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${destroot}${prefix}/lib/${python_name} ${destroot}${py_install_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # link from iio.framework to normal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set iio_framework_version 0.18
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set iio_framework_top ${frameworks_dir}/iio.framework
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set iio_framework ${iio_framework_top}/Versions/${iio_framework_version}/iio
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set iio_dr_framework_top ${destroot}${iio_framework_top}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # fix iio library & link it into .../lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${iio_framework_top}/Versions/${iio_framework_version}/iio ${destroot}${prefix}/lib/libiio.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "install_name_tool -id ${iio_framework} ${destroot}${iio_framework}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # fix Tools, and link them into .../bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach app [glob ${iio_dr_framework_top}/Tools/*] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set non_dr_app [strsed ${app} "s@${destroot}@@"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set lib_iio_framework [strsed ${iio_framework} "s@Library/Frameworks@lib@"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "install_name_tool -change ${lib_iio_framework} ${iio_framework} ${app}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${non_dr_app} ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # move Python install to frameworks_dir for Python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set py_install_dir ${python_top_dir}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}${py_install_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${destroot}${prefix}/lib/${python_name} ${destroot}${py_install_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # link from iio.framework to normal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set iio_framework_version ${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set iio_framework_top ${frameworks_dir}/iio.framework
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set iio_framework ${iio_framework_top}/Versions/${iio_framework_version}/iio
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set iio_dr_framework_top ${destroot}${iio_framework_top}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # fix iio library & link it into .../lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${iio_framework_top}/Versions/${iio_framework_version}/iio ${destroot}${prefix}/lib/libiio.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -id ${iio_framework} ${destroot}${iio_framework}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # fix Tools, and link them into .../bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach app [glob ${iio_dr_framework_top}/Tools/*] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set non_dr_app [strsed ${app} "s@${destroot}@@"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set lib_iio_framework [strsed ${iio_framework} "s@Library/Frameworks@lib@"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -change ${lib_iio_framework} ${iio_framework} ${app}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${non_dr_app} ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # link includes into .../include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach header [glob ${iio_dr_framework_top}/Versions/${iio_framework_version}/Headers/*] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s [strsed ${header} "s@${destroot}@@"] ${destroot}${prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # link includes into .../include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}${prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach header [glob ${iio_dr_framework_top}/Versions/${iio_framework_version}/Headers/*] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s [strsed ${header} "s@${destroot}@@"] ${destroot}${prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/libiio/files/patch-fix_build.devel.diff b/science/libiio/files/patch-fix_build.devel.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5255137..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/libiio/files/patch-fix_build.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,61 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13,18 +13,22 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "default install path" FORCE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set(CMAKE_INSTALL_DOCDIR "" CACHE PATH "documentation root (DATAROOTDIR/doc/${PROJECT_NAME}${LIBIIO_VERSION_MAJOR}-doc)")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include(GNUInstallDirs)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(ENABLE_SHARED AND ${CMAKE_SYSTEM_NAME} MATCHES "Linux")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set(CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${PROJECT_NAME}${LIBIIO_VERSION_MAJOR}-doc")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Set the default install DOCDIR if not provided
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if (NOT CMAKE_INSTALL_DOCDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set (CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${PROJECT_NAME}${LIBIIO_VERSION_MAJOR}-doc")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CACHE PATH "Installation directory for pkgconfig (.pc) files")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mark_as_advanced(INSTALL_PKGCONFIG_DIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Set the default build type if not provided
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (NOT CMAKE_BUILD_TYPE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34,16 +38,23 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(BUILD_SHARED_LIBS ON CACHE BOOL "Build shared libraries")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Darwin-specific settings
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- option(OSX_PACKAGE "Create a OSX package" ON)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(OSX_INSTALL_FRAMEWORKSDIR "/Library/Frameworks" CACHE STRING "Installation directory for frameworks")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # Set the default install location if not provided
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (NOT OSX_INSTALL_FRAMEWORKSDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set (OSX_INSTALL_FRAMEWORKSDIR "/Library/Frameworks" CACHE STRING "Installation directory for frameworks")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- get_filename_component(OSX_INSTALL_FRAMEWORKSDIR "${OSX_INSTALL_FRAMEWORKSDIR}" REALPATH BASE_DIR "${CMAKE_BINARY_DIR}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_MACOSX_RPATH ON)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(SKIP_INSTALL_ALL ${OSX_PACKAGE})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# set these before any external include directories
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- option(WITH_NETWORK_BACKEND "Enable the network backend" ON)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- option(WITH_TESTS "Build the test programs" ON)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -215,8 +226,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(WITH_NETWORK_BACKEND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(LIBS_TO_LINK ${LIBS_TO_LINK} wsock32 ws2_32)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/libiio/files/patch-fix_build.release.diff b/science/libiio/files/patch-fix_build.release.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index a8ce57d..6ab175a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/libiio/files/patch-fix_build.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/libiio/files/patch-fix_build.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,58 +1,61 @@
</span> --- CMakeLists.txt.orig
+++ CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13,7 +13,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -13,18 +13,22 @@
</span> set(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "default install path" FORCE)
endif()
-set(CMAKE_INSTALL_DOCDIR "" CACHE PATH "documentation root (DATAROOTDIR/doc/${PROJECT_NAME}${LIBIIO_VERSION_MAJOR}-doc)")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+set(CMAKE_INSTALL_DOCDIR "" CACHE PATH "documentation root (DATAROOTDIR/doc/${PROJECT_NAME}${LIBIIO_VERSION_MAJOR})")
</span> include(GNUInstallDirs)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(ENABLE_SHARED AND ${CMAKE_SYSTEM_NAME} MATCHES "Linux")
</span> set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -40,6 +40,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set(CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${PROJECT_NAME}${LIBIIO_VERSION_MAJOR}-doc")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Set the default install DOCDIR if not provided
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if (NOT CMAKE_INSTALL_DOCDIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set (CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${PROJECT_NAME}${LIBIIO_VERSION_MAJOR}-doc")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CACHE PATH "Installation directory for pkgconfig (.pc) files")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mark_as_advanced(INSTALL_PKGCONFIG_DIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Set the default build type if not provided
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (NOT CMAKE_BUILD_TYPE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34,16 +38,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(BUILD_SHARED_LIBS ON CACHE BOOL "Build shared libraries")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Darwin-specific settings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ option(OSX_PACKAGE "Create a OSX package" ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(OSX_INSTALL_FRAMEWORKSDIR "/Library/Frameworks" CACHE STRING "Installation directory for frameworks")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # Set the default install location if not provided
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (NOT OSX_INSTALL_FRAMEWORKSDIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set (OSX_INSTALL_FRAMEWORKSDIR "/Library/Frameworks" CACHE STRING "Installation directory for frameworks")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ get_filename_component(OSX_INSTALL_FRAMEWORKSDIR "${OSX_INSTALL_FRAMEWORKSDIR}" REALPATH BASE_DIR "${CMAKE_BINARY_DIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_MACOSX_RPATH ON)
</span> set(SKIP_INSTALL_ALL ${OSX_PACKAGE})
endif()
<span style='display:block; white-space:pre;background:#e0ffe0;'>++# set these before any external include directories
</span> +include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
+
option(WITH_NETWORK_BACKEND "Enable the network backend" ON)
option(WITH_TESTS "Build the test programs" ON)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -211,8 +213,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -226,8 +237,6 @@
</span> endif()
endif()
-include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
-
if(WITH_NETWORK_BACKEND)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(STATUS "Building with Network back end support")
</span> if (WIN32)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set(LIBS_TO_LINK ${LIBS_TO_LINK} wsock32 ws2_32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -348,7 +348,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- FRAMEWORK DESTINATION /Library/Frameworks
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ FRAMEWORK DESTINATION ${CMAKE_INSTALL_MP_FRAMEWORKS_DIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -415,7 +415,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND ${PKGBUILD_EXECUTABLE}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --component ${LIBIIO_FRAMEWORK_DIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --identifier com.adi.iio --version ${VERSION}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- --install-location /Library/Frameworks ${LIBIIO_TEMP_PKG}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ --install-location ${CMAKE_INSTALL_MP_FRAMEWORKS_DIR} ${LIBIIO_TEMP_PKG}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND ${PRODUCTBUILD_EXECUTABLE}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --distribution ${LIBIIO_DISTRIBUTION_XML} ${LIBIIO_PKG}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND ${CMAKE_COMMAND} -E remove ${LIBIIO_TEMP_PKG}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tests/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tests/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -50,7 +50,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(NOT SKIP_INSTALL_ALL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- install(TARGETS ${IIO_TESTS_TARGETS} RUNTIME DESTINATION /Library/Frameworks/iio.framework/Tools)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ install(TARGETS ${IIO_TESTS_TARGETS} RUNTIME DESTINATION ${CMAKE_INSTALL_MP_FRAMEWORKS_DIR}/iio.framework/Tools)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install(TARGETS ${IIO_TESTS_TARGETS} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span></pre><pre style='margin:0'>
</pre>