Hello community, here is the log from the commit of package oyranos for openSUSE:Factory checked in at 2017-08-17 11:50:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/oyranos (Old) and /work/SRC/openSUSE:Factory/.oyranos.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "oyranos" Thu Aug 17 11:50:55 2017 rev:21 rq:512734 version:0.9.6 Changes: -------- --- /work/SRC/openSUSE:Factory/oyranos/oyranos.changes 2017-02-03 17:52:40.865668421 +0100 +++ /work/SRC/openSUSE:Factory/.oyranos.new/oyranos.changes 2017-08-17 11:51:03.450994016 +0200 @@ -1,0 +2,33 @@ +Tue Jul 25 08:07:44 UTC 2017 - [email protected] + +- Fix fltk dependencies wrt bsc#1032582 + +------------------------------------------------------------------- +Fri Jul 21 14:12:46 UTC 2017 - [email protected] + +- Fix double defined prefix in cmake Finders/configs + +------------------------------------------------------------------- +Fri Jul 21 12:56:37 UTC 2017 - [email protected] + +- Redux to contain only the architectures we really build against + no mandriva/rhel/centos builds present anywhere in the OBS +- Switch to %cmake macros as the configure is just dumb wrapper + on top of cmake +- Drop the qt4 subpackage as we really try to have qt5 only in + new releases +- Apply patches for the cmake from Gentoo: + * 0001-Use-GNUInstallDirs.patch + * 0002-mv-src-examples-oforms-src-tools-oforms.patch + * 0003-Make-tests-optional.patch + * 0004-Make-examples-optional.patch + * 0005-Make-static-libs-optional.patch + * 0006-Use-FindFLTK-shipped-by-cmake.patch +- Add patch to fix underlinking: + * 0007-No-undefined.patch +- Drop the lcms-devel dependency, we want to build only against lcms2 +- Drop the alpha-devel-doc subpackage as the cmake inehritently generates + all docu in one batch +- Add missing ghostscript fonts to generate working dot files + +------------------------------------------------------------------- New: ---- 0001-Use-GNUInstallDirs.patch 0002-mv-src-examples-oforms-src-tools-oforms.patch 0003-Make-tests-optional.patch 0004-Make-examples-optional.patch 0005-Make-static-libs-optional.patch 0006-Use-FindFLTK-shipped-by-cmake.patch 0007-No-undefined.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ oyranos.spec ++++++ --- /var/tmp/diff_new_pack.b9ECWo/_old 2017-08-17 11:51:06.262599098 +0200 +++ /var/tmp/diff_new_pack.b9ECWo/_new 2017-08-17 11:51:06.274597412 +0200 @@ -17,11 +17,7 @@ # -Version: 0.9.6 -Release: 0 -Source0: oyranos_%{version}.orig.tar.bz2 -Source1: oyranos_%{version}-1.debian.tar.gz -%define syscolordir /usr/share/color +%define syscolordir %{_datadir}/color %define usercolordir ~/.config/color %define usercolordata ~/.local/share/color %define iccdirname icc @@ -29,121 +25,52 @@ %define metasubpath oyranos-meta %define settingsdirname settings %define targetdirname target -%define pixmapdir /usr/share/pixmaps -%define icondir /usr/share/icons -%define desktopdir /usr/share/applications - +%define pixmapdir %{_datadir}/pixmaps +%define icondir %{_datadir}/icons +%define desktopdir %{_datadir}/applications +Name: oyranos +Version: 0.9.6 +Release: 0 Summary: Color Management System -License: BSD-3-Clause and GPL-2.0 +License: BSD-3-Clause AND GPL-2.0 Group: Development/Libraries/Other - -Name: oyranos Url: http://www.oyranos.org -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Prefix: %{_prefix} - +Source0: oyranos_%{version}.orig.tar.bz2 +Source1: oyranos_%{version}-1.debian.tar.gz Source2: oyranos-rpmlintrc -BuildRequires: cairo-devel +Patch0: 0001-Use-GNUInstallDirs.patch +Patch1: 0002-mv-src-examples-oforms-src-tools-oforms.patch +Patch2: 0003-Make-tests-optional.patch +Patch3: 0004-Make-examples-optional.patch +Patch4: 0005-Make-static-libs-optional.patch +Patch5: 0006-Use-FindFLTK-shipped-by-cmake.patch +Patch6: 0007-No-undefined.patch BuildRequires: cmake BuildRequires: color-filesystem BuildRequires: cups-devel BuildRequires: desktop-file-utils BuildRequires: doxygen +BuildRequires: fltk-devel BuildRequires: gcc-c++ BuildRequires: gettext -BuildRequires: libXcm-devel >= 0.5.4 -BuildRequires: netpbm -BuildRequires: pkgconfig -BuildRequires: xdg-utils - -Requires: oyranos-monitor -Requires: oyranos-profile-graph -%if 0%{?suse_version} > 0 -Recommends: oyranos-qcmsevents -%endif - -%if 0%{?suse_version} > 0 -BuildRequires: fltk -BuildRequires: fltk-devel -BuildRequires: graphviz +BuildRequires: ghostscript-fonts-std +BuildRequires: graphviz-gd BuildRequires: libjpeg-devel BuildRequires: libltdl-devel BuildRequires: libyajl-devel +BuildRequires: netpbm +BuildRequires: pkgconfig BuildRequires: update-desktop-files -BuildRequires: pkgconfig(QtGui) -BuildRequires: pkgconfig(exiv2) -BuildRequires: pkgconfig(gl) -BuildRequires: pkgconfig(glu) -BuildRequires: pkgconfig(lcms) -BuildRequires: pkgconfig(lcms2) -BuildRequires: pkgconfig(libpng) -BuildRequires: pkgconfig(libraw) -BuildRequires: pkgconfig(libtiff-4) -BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: pkgconfig(sane-backends) -BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(xfixes) -BuildRequires: pkgconfig(xinerama) -BuildRequires: pkgconfig(xmu) -BuildRequires: pkgconfig(xp) -BuildRequires: pkgconfig(xpm) -BuildRequires: pkgconfig(xrandr) -BuildRequires: pkgconfig(xxf86vm) -%endif - -%if 0%{?suse_version} > 1310 +BuildRequires: xdg-utils BuildRequires: pkgconfig(Qt5Svg) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5X11Extras) BuildRequires: pkgconfig(Qt5Xml) -%define use_qt5 1 -%else -%define use_qt5 0 -%endif - -%if 0%{?suse_version} +BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(elektra) -%define use_elektra 1 -%else -%define use_elektra 0 -%endif - -%if 0%{?mandriva_version} > 0 -BuildRequires: fltk -BuildRequires: fltk-devel -BuildRequires: graphviz -BuildRequires: libjpeg -BuildRequires: libjpeg-devel -BuildRequires: libtool-devel -BuildRequires: pkgconfig(QtGui) -BuildRequires: pkgconfig(gl) -BuildRequires: pkgconfig(glu) -BuildRequires: pkgconfig(lcms) -BuildRequires: pkgconfig(libpng) -BuildRequires: pkgconfig(libtiff-4) -BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(xfixes) -BuildRequires: pkgconfig(xinerama) -BuildRequires: pkgconfig(xmu) -BuildRequires: pkgconfig(xrandr) -%endif - -%if 0%{?fedora_version} > 0 && 0%{?rhel_version} < 600 -BuildRequires: fltk -BuildRequires: fltk-devel -BuildRequires: fltk-fluid -BuildRequires: graphviz -BuildRequires: libjpeg -BuildRequires: libjpeg-devel -BuildRequires: liblcms-devel -BuildRequires: libtool -BuildRequires: libtool-ltdl-devel -BuildRequires: pkgconfig(QtGui) BuildRequires: pkgconfig(exiv2) BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glu) -BuildRequires: pkgconfig(lcms) BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libraw) @@ -151,6 +78,7 @@ BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(sane-backends) BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xcm) >= 0.5.4 BuildRequires: pkgconfig(xfixes) BuildRequires: pkgconfig(xinerama) BuildRequires: pkgconfig(xmu) @@ -158,80 +86,20 @@ BuildRequires: pkgconfig(xpm) BuildRequires: pkgconfig(xrandr) BuildRequires: pkgconfig(xxf86vm) -%if 0%{?fedora_version} < 21 -BuildRequires: yajl >= 2.1.0 -BuildRequires: yajl-devel >= 2.1.0 -%endif -%endif - -%if 0%{?centos_version} >= 600 -BuildRequires: fltk -BuildRequires: fltk-devel -BuildRequires: fltk-fluid -BuildRequires: graphviz -BuildRequires: libjpeg -BuildRequires: libjpeg-devel -BuildRequires: libtool -BuildRequires: libtool-ltdl -BuildRequires: libtool-ltdl-devel -BuildRequires: yajl-devel -BuildRequires: pkgconfig(QtGui) -BuildRequires: pkgconfig(exiv2) -BuildRequires: pkgconfig(gl) -BuildRequires: pkgconfig(glu) -BuildRequires: pkgconfig(lcms2) -BuildRequires: pkgconfig(libpng) -BuildRequires: pkgconfig(libraw) -BuildRequires: pkgconfig(libtiff-4) -BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: pkgconfig(sane-backends) -BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(xfixes) -BuildRequires: pkgconfig(xinerama) -BuildRequires: pkgconfig(xmu) -BuildRequires: pkgconfig(xp) -BuildRequires: pkgconfig(xpm) -BuildRequires: pkgconfig(xrandr) -BuildRequires: pkgconfig(xxf86vm) -%endif - -%if 0%{?rhel_version} >= 600 -%define use_fltk 0 -BuildRequires: libjpeg -BuildRequires: libjpeg-devel -BuildRequires: libtool -BuildRequires: pkgconfig(QtGui) -BuildRequires: pkgconfig(gl) -BuildRequires: pkgconfig(glu) -BuildRequires: pkgconfig(lcms2) -BuildRequires: pkgconfig(libpng) -BuildRequires: pkgconfig(libtiff-4) -BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: pkgconfig(sane-backends) -BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(xfixes) -BuildRequires: pkgconfig(xinerama) -BuildRequires: pkgconfig(xmu) -BuildRequires: pkgconfig(xp) -BuildRequires: pkgconfig(xpm) -BuildRequires: pkgconfig(xrandr) -BuildRequires: pkgconfig(xxf86vm) -%else -%define use_fltk 1 -%endif +Requires: oyranos-monitor +Requires: oyranos-profile-graph +Recommends: oyranos-qcmsevents %package -n lib%{name}0 Summary: Color Management System Libraries -Group: Development/Libraries/Other # assume users want the device modules -Requires: lib%{name}0-cups = %{version} -%if 0%{?suse_version} > 1130 || 0%{?fedora_version} > 0 -Requires: lib%{name}0-lraw = %{version} -%endif -Requires: lib%{name}0-monitor = %{version} # we need rgb, lab, xyz gray and cmyk profiles # the proper names: sRGB.icc, XYZ.icc, Lab.icc are in the OpenICC-data package +Group: Development/Libraries/Other Requires: icc-profiles +Requires: lib%{name}0-cups = %{version} +Requires: lib%{name}0-lraw = %{version} +Requires: lib%{name}0-monitor = %{version} # for mount-openicc we need the cli Requires(post): elektra @@ -239,25 +107,17 @@ Summary: Headers, Configuration and static Libs + Documentation Group: Development/Libraries/Other Requires: lib%{name}0 = %{version} -Requires: libxml2-devel -%if 0%{?suse_version} > 1130 Requires: libyajl-devel -%endif +Requires: pkgconfig(libxml-2.0) %package -n lib%{name}-alpha-devel Summary: Alpha and Pre Alpha Headers Group: Development/Libraries/Other Requires: lib%{name}-devel = %{version} -%package -n lib%{name}-alpha-devel-doc -Summary: Alpha and Pre Alpha Documentation -Group: Development/Libraries/Other -Requires: lib%{name}-alpha-devel = %{version} - %package -n lib%{name}0-monitor Summary: Oyranos Monitor dependent Libraries Group: Development/Libraries/Other -Requires: libXcm0 >= 0.5.4 Requires: xcalib %package monitor @@ -274,34 +134,22 @@ Group: Development/Libraries/Other Requires: cups -%if 0%{?suse_version} > 1130 || 0%{?fedora_version} > 0 %package -n lib%{name}0-lraw Summary: LibRaw device support Group: Development/Libraries/Other -%endif %package -n lib%{name}0-sane Summary: SANE device support Group: Development/Libraries/Other -%if 0%{?use_fltk} > 0 %package ui-fltk Summary: Example Configuration Panel + Image Viewer Group: System/GUI/Other -Requires: fltk -%endif -%if 0%{?use_qt5} > 0 %package qcmsevents Summary: Xorg Color management Event observer applet Group: System/Monitoring Requires: oyranos-monitor -%endif - -%package qcmsevents-qt4 -Summary: Xorg Color management Event observer applet -Group: System/Monitoring -Requires: oyranos-monitor %description Oyranos is a color management system. @@ -339,10 +187,6 @@ are supported. These API's are to be considered for changing very frequently. -%description -n lib%{name}-alpha-devel-doc -Documentation for development. -These API's are to be considered for changing very frequently. - %description monitor The monitor profile configuration tool. @@ -358,80 +202,85 @@ CUPS device support for the Oyranos color management system. -%if 0%{?suse_version} > 1130 || 0%{?fedora_version} > 0 %description -n lib%{name}0-lraw LibRaw device support for the Oyranos color management system. -%endif %description -n lib%{name}0-sane SANE device support for the Oyranos color management system. -%if 0%{?use_fltk} > 0 %description ui-fltk A example configuration GUI and a image viewer. Oyranos is a color management system. -%endif -%if 0%{?use_qt5} > 0 %description qcmsevents the applet shows if a color server is running through a icon in the system tray. -%endif - -%description qcmsevents-qt4 -the applet shows if a color server is running through a icon in -the system tray. %prep %setup -q +%autopatch -p1 + +# Remove bundled sources +rm -r libxcm yajl +# TODO: openicc %build -%configure --enable-debug -%{__make} VERBOSE=1 %{_smp_mflags} || make +%cmake \ + -DCMAKE_INSTALL_DOCDIR=share/doc/packages/lib%{name}-devel \ + -DENABLE_FLTK=ON \ + -DUSE_SYSTEM_ELEKTRA=ON \ + -DUSE_SYSTEM_LIBXCM=ON \ + -DUSE_SYSTEM_OPENICC=OFF \ + -DUSE_SYSTEM_YAJL=ON \ + -DCMAKE_DISABLE_FIND_PACKAGE_Qt4=ON \ + -DCMAKE_DISABLE_FIND_PACKAGE_Cairo=OFF \ + -DCMAKE_DISABLE_FIND_PACKAGE_Cups=OFF \ + -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=OFF \ + -DENABLE_EXAMPLES=ON \ + -DCMAKE_DISABLE_FIND_PACKAGE_Exif2=OFF \ + -DCMAKE_DISABLE_FIND_PACKAGE_FLTK=OFF \ + -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=OFF \ + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=OFF \ + -DCMAKE_DISABLE_FIND_PACKAGE_LibRaw=OFF \ + -DCMAKE_DISABLE_FIND_PACKAGE_Sane=OFF \ + -DENABLE_STATIC_LIBS=OFF \ + -DENABLE_TESTS=OFF \ + -DCMAKE_DISABLE_FIND_PACKAGE_TIFF=OFF \ + -DCMAKE_DISABLE_FIND_PACKAGE_X11=OFF +make %{?_smp_mflags} %install -%make_install +%cmake_install +# remove qt4 mans +rm %{buildroot}%{_mandir}/man1/qcmsevents-qt4.1 rm -fr %{buildroot}/%{_datadir}/doc/%{name}-%{version} -%if 0%{?use_qt5} > 0 cp -av src/tools/qcmsevents/qcmsevents-applet.desktop . -%endif -cp -av src/tools/qcmsevents/qcmsevents-qt4-applet.desktop . cp -av extras/%{name}-profile-install.desktop . cp -av src/examples/image_display/%{name}-image-display.desktop . echo 'X-SuSE-translate=true' >> qcmsevents-applet.desktop -echo 'X-SuSE-translate=true' >> qcmsevents-qt4-applet.desktop echo 'X-SuSE-translate=true' >> %{name}-profile-install.desktop echo 'X-SuSE-translate=true' >> %{name}-image-display.desktop -%if 0%{?use_qt5} > 0 desktop-file-install --dir=%{buildroot}/%{desktopdir} qcmsevents-applet.desktop -%endif -desktop-file-install --dir=%{buildroot}/%{desktopdir} qcmsevents-qt4-applet.desktop desktop-file-install --dir=%{buildroot}/%{desktopdir} %{name}-profile-install.desktop -%if 0%{?use_fltk} > 0 desktop-file-install --dir=%{buildroot}/%{desktopdir} %{name}-image-display.desktop -%endif -#fix rpath issues -#chrpath --delete %{buildroot}/%{_bindir}/oyranos-xforms-modules +# Fix cmake detectors +sed -i \ + -e "s:/usr//usr:%{_prefix}:g" \ + %{buildroot}%{_libdir}/cmake/%{name}/*.cmake %find_lang %{name} # generate a special file list -%if 0%{?use_qt5} == 0 -rm %{buildroot}/%{_mandir}/man1/qcmsevents.1* -%endif %post -n lib%{name}0 /sbin/ldconfig export LD_LIBRARY_PATH=%{_libdir}/elektra4/:$LD_LIBRARY_PATH -%if 0%{?use_elektra} > 0 kdb mount-openicc || : -%endif %postun -n lib%{name}0 -p /sbin/ldconfig %files -f %{name}.lang -%defattr(-, root, root) %doc AUTHORS.md COPYING.md ChangeLog.md README.md %{_bindir}/%{name}-compat-gnome %{_bindir}/%{name}-icc @@ -454,7 +303,6 @@ %{desktopdir}/%{name}-profile-install.desktop %files -n lib%{name}0 -%defattr(-, root, root) %{_libdir}/libOyranosCore.so.* %{_libdir}/libOyranosObject.so.* %{_libdir}/libOyranosModules.so.* @@ -473,7 +321,6 @@ %{_libdir}/%{metasubpath}/lib%{name}_oyIM_cmm_module* %files -n lib%{name}-devel -%defattr(-, root, root) %{_bindir}/%{name}-config %{_libdir}/libOyranosCore.so %{_libdir}/libOyranosObject.so @@ -486,34 +333,22 @@ %{_libdir}/pkgconfig/* %dir %{_libdir}/cmake/oyranos/ %{_libdir}/cmake/oyranos/*.cmake -%{_libdir}/lib%{name}_core-static.a -%{_libdir}/lib%{name}_object-static.a -%{_libdir}/lib%{name}_modules-static.a -%{_libdir}/lib%{name}_config-static.a -%{_libdir}/lib%{name}-static.a %{_mandir}/man3/%{name}-config.3* -%{_mandir}/man3/%{name}.* -%doc doc/html +%{_mandir}/man3/%{name}.3%{ext_man} +%{_docdir}/lib%{name}-devel %files -n lib%{name}-alpha-devel -%defattr(-, root, root) %dir %{_includedir}/%{name}/alpha %{_includedir}/%{name}/alpha/%{name}_alpha.h -%files -n lib%{name}-alpha-devel-doc -%defattr(-, root, root) -%doc doc/doc_alpha/html - %files monitor -%defattr(-, root, root) %{_bindir}/%{name}-monitor %{_bindir}/%{name}-monitor-daemon %{_mandir}/man1/%{name}-monitor.1* %{_mandir}/man1/%{name}-monitor-daemon.1* -/etc/xdg/autostart/%{name}-monitor-setup.desktop +%{_sysconfdir}/xdg/autostart/%{name}-monitor-setup.desktop %files -n lib%{name}0-monitor -%defattr(-, root, root) %dir %{_libdir}/color/ %dir %{_libdir}/%{cmmsubpath}/ %{_libdir}/%{cmmsubpath}/lib%{name}_oyX1_cmm_module* @@ -522,35 +357,28 @@ %{syscolordir}/rank-map/config.icc_profile.monitor.*.json %files -n lib%{name}0-cups -%defattr(-, root, root) %dir %{_libdir}/color/ %dir %{_libdir}/%{cmmsubpath}/ %{_libdir}/%{cmmsubpath}/lib%{name}_CUPS_cmm_module* %dir %{syscolordir}/rank-map %{syscolordir}/rank-map/config.icc_profile.printer.*.json -%if 0%{?suse_version} > 1130 || 0%{?fedora_version} > 0 %files -n lib%{name}0-lraw -%defattr(-, root, root) %dir %{_libdir}/color/ %dir %{_libdir}/%{cmmsubpath}/ %{_libdir}/%{cmmsubpath}/lib%{name}_lraw_cmm_module* %{_libdir}/%{cmmsubpath}/lib%{name}_oyRE_cmm_module* %dir %{syscolordir}/rank-map %{syscolordir}/rank-map/config.icc_profile.raw-image.*.json -%endif %files -n lib%{name}0-sane -%defattr(-, root, root) %dir %{_libdir}/color/ %dir %{_libdir}/%{cmmsubpath}/ %{_libdir}/%{cmmsubpath}/lib%{name}_SANE_cmm_module* %dir %{syscolordir}/rank-map %{syscolordir}/rank-map/config.icc_profile.scanner.*.json -%if 0%{?use_fltk} > 0 %files ui-fltk -%defattr(-, root, root) %{_bindir}/%{name}-config-fl* %{_bindir}/%{name}-image-display %{_bindir}/%{name}-xforms-fltk @@ -558,26 +386,14 @@ %{_mandir}/man1/%{name}-image-display.1* %{_mandir}/man1/%{name}-xforms-fltk.1* %{desktopdir}/%{name}-image-display.desktop -%endif -%if 0%{?use_qt5} > 0 %files qcmsevents -%defattr(-, root, root) %{_bindir}/qcmsevents %{_mandir}/man1/qcmsevents.1* %{pixmapdir}/qcmsevents.* %{desktopdir}/qcmsevents-applet.desktop -%endif - -%files qcmsevents-qt4 -%defattr(-, root, root) -%{_bindir}/qcmsevents-qt4 -%{_mandir}/man1/qcmsevents-qt4.1* -%{desktopdir}/qcmsevents-qt4-applet.desktop -%{pixmapdir}/qcmsevents-qt4.* %files profile-graph -%defattr(-, root, root) %{_bindir}/%{name}-profile-graph %{_mandir}/man1/%{name}-profile-graph.1* ++++++ 0001-Use-GNUInstallDirs.patch ++++++ ++++ 778 lines (skipped) ++++++ 0002-mv-src-examples-oforms-src-tools-oforms.patch ++++++ >From 193a69b22f8b382889876dc3ea1d50d9c5cd8b8c Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner <[email protected]> Date: Sun, 1 Jan 2017 01:16:08 +0100 Subject: [PATCH 2/6] mv src/examples/oforms src/tools/oforms So far, oforms is located within examples, but oyranos-icc in tools depends on it. It seems that oforms should rather be in tools as well. --- src/examples/CMakeLists.txt | 27 ---------------------- src/tools/CMakeLists.txt | 26 +++++++++++++++++++++ src/{examples => tools}/oforms/CMakeLists.txt | 0 .../oforms/oyranos-xforms-fltk.1 | 0 .../oforms/oyranos-xforms-modules.1 | 0 src/{examples => tools}/oforms/oyranos-xforms.1 | 0 .../oforms/oyranos_forms_cmd_line.c | 0 .../oforms/oyranos_forms_fltk.cxx | 0 .../oforms/oyranos_widgets_fltk.cxx | 0 .../oforms/oyranos_widgets_fltk.h | 0 src/{examples => tools}/oforms/oyranos_xforms.c | 0 .../oforms/oyranos_xforms.makefile | 0 .../oforms/oyranos_xforms_fltk.cxx | 0 .../oforms/oyranos_xforms_modules.c | 0 14 files changed, 26 insertions(+), 27 deletions(-) rename src/{examples => tools}/oforms/CMakeLists.txt (100%) rename src/{examples => tools}/oforms/oyranos-xforms-fltk.1 (100%) rename src/{examples => tools}/oforms/oyranos-xforms-modules.1 (100%) rename src/{examples => tools}/oforms/oyranos-xforms.1 (100%) rename src/{examples => tools}/oforms/oyranos_forms_cmd_line.c (100%) rename src/{examples => tools}/oforms/oyranos_forms_fltk.cxx (100%) rename src/{examples => tools}/oforms/oyranos_widgets_fltk.cxx (100%) rename src/{examples => tools}/oforms/oyranos_widgets_fltk.h (100%) rename src/{examples => tools}/oforms/oyranos_xforms.c (100%) rename src/{examples => tools}/oforms/oyranos_xforms.makefile (100%) rename src/{examples => tools}/oforms/oyranos_xforms_fltk.cxx (100%) rename src/{examples => tools}/oforms/oyranos_xforms_modules.c (100%) diff --git a/src/examples/CMakeLists.txt b/src/examples/CMakeLists.txt index 14598e3..89cd4de 100644 --- a/src/examples/CMakeLists.txt +++ b/src/examples/CMakeLists.txt @@ -74,33 +74,6 @@ IF( FLTK_FOUND ) INSTALL (TARGETS oyranos-config-fltk DESTINATION ${CMAKE_INSTALL_BINDIR}) ENDIF() - -ADD_SUBDIRECTORY( oforms ) - -# oFORMS for a Oyranos CLI renderer and parser -ADD_EXECUTABLE( oyranos-xforms oforms/oyranos_xforms.c ) -TARGET_LINK_LIBRARIES( oyranos-xforms - ${OY_OFORMS_LIB} ${PROJECT_NAME} ${EXTRA_LIBS} ) -INSTALL (TARGETS oyranos-xforms DESTINATION ${CMAKE_INSTALL_BINDIR}) - -# oFORMS for a Oyranos FLTK renderer and parser -IF( FLTK_FOUND ) - ADD_EXECUTABLE( oyranos-xforms-fltk - oforms/oyranos_forms_fltk.cxx - oforms/oyranos_widgets_fltk.cxx - oforms/oyranos_xforms_fltk.cxx - ) - TARGET_LINK_LIBRARIES ( oyranos-xforms-fltk ${PROJECT_NAME} ${EXTRA_LIBS} - ${OY_OFORMS_LIB} ${FLTK_LIBRARIES} ${XRANDR_LIBRARIES} ) - INSTALL (TARGETS oyranos-xforms-fltk DESTINATION ${CMAKE_INSTALL_BINDIR}) -ENDIF() - -# oFORMS for a Oyranos module generation -ADD_EXECUTABLE( oyranos-xforms-modules oforms/oyranos_xforms_modules.c ) -TARGET_LINK_LIBRARIES( oyranos-xforms-modules - ${PROJECT_NAME} ${OY_OFORMS_LIB} ${EXTRA_LIBS} ) -INSTALL (TARGETS oyranos-xforms-modules DESTINATION ${CMAKE_INSTALL_BINDIR}) - # Tutorial 1 ADD_EXECUTABLE( tutorial1 tutorial1.c ) TARGET_LINK_LIBRARIES( tutorial1 diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt index 237b508..1edf0d0 100644 --- a/src/tools/CMakeLists.txt +++ b/src/tools/CMakeLists.txt @@ -34,6 +34,32 @@ IF( CAIRO_FOUND ) INSTALL (TARGETS oyranos-profile-graph DESTINATION ${CMAKE_INSTALL_BINDIR}) ENDIF() +ADD_SUBDIRECTORY( oforms ) + +# oFORMS for a Oyranos CLI renderer and parser +ADD_EXECUTABLE( oyranos-xforms oforms/oyranos_xforms.c ) +TARGET_LINK_LIBRARIES( oyranos-xforms + ${OY_OFORMS_LIB} ${PROJECT_NAME} ${EXTRA_LIBS} ) +INSTALL (TARGETS oyranos-xforms DESTINATION ${CMAKE_INSTALL_BINDIR}) + +# oFORMS for a Oyranos FLTK renderer and parser +IF( FLTK_FOUND ) + ADD_EXECUTABLE( oyranos-xforms-fltk + oforms/oyranos_forms_fltk.cxx + oforms/oyranos_widgets_fltk.cxx + oforms/oyranos_xforms_fltk.cxx + ) + TARGET_LINK_LIBRARIES ( oyranos-xforms-fltk ${PROJECT_NAME} ${EXTRA_LIBS} + ${OY_OFORMS_LIB} ${FLTK_LIBRARIES} ${XRANDR_LIBRARIES} ) + INSTALL (TARGETS oyranos-xforms-fltk DESTINATION ${CMAKE_INSTALL_BINDIR}) +ENDIF() + +# oFORMS for a Oyranos module generation +ADD_EXECUTABLE( oyranos-xforms-modules oforms/oyranos_xforms_modules.c ) +TARGET_LINK_LIBRARIES( oyranos-xforms-modules + ${PROJECT_NAME} ${OY_OFORMS_LIB} ${EXTRA_LIBS} ) +INSTALL (TARGETS oyranos-xforms-modules DESTINATION ${CMAKE_INSTALL_BINDIR}) + # color conversion ADD_EXECUTABLE( oyranos-icc "${CMAKE_CURRENT_SOURCE_DIR}/oyranos_convert.c" ) TARGET_LINK_LIBRARIES( oyranos-icc ${PROJECT_NAME} ${EXTRA_LIBS} oyranos_forms_cmd_line-static ) diff --git a/src/examples/oforms/CMakeLists.txt b/src/tools/oforms/CMakeLists.txt similarity index 100% rename from src/examples/oforms/CMakeLists.txt rename to src/tools/oforms/CMakeLists.txt diff --git a/src/examples/oforms/oyranos-xforms-fltk.1 b/src/tools/oforms/oyranos-xforms-fltk.1 similarity index 100% rename from src/examples/oforms/oyranos-xforms-fltk.1 rename to src/tools/oforms/oyranos-xforms-fltk.1 diff --git a/src/examples/oforms/oyranos-xforms-modules.1 b/src/tools/oforms/oyranos-xforms-modules.1 similarity index 100% rename from src/examples/oforms/oyranos-xforms-modules.1 rename to src/tools/oforms/oyranos-xforms-modules.1 diff --git a/src/examples/oforms/oyranos-xforms.1 b/src/tools/oforms/oyranos-xforms.1 similarity index 100% rename from src/examples/oforms/oyranos-xforms.1 rename to src/tools/oforms/oyranos-xforms.1 diff --git a/src/examples/oforms/oyranos_forms_cmd_line.c b/src/tools/oforms/oyranos_forms_cmd_line.c similarity index 100% rename from src/examples/oforms/oyranos_forms_cmd_line.c rename to src/tools/oforms/oyranos_forms_cmd_line.c diff --git a/src/examples/oforms/oyranos_forms_fltk.cxx b/src/tools/oforms/oyranos_forms_fltk.cxx similarity index 100% rename from src/examples/oforms/oyranos_forms_fltk.cxx rename to src/tools/oforms/oyranos_forms_fltk.cxx diff --git a/src/examples/oforms/oyranos_widgets_fltk.cxx b/src/tools/oforms/oyranos_widgets_fltk.cxx similarity index 100% rename from src/examples/oforms/oyranos_widgets_fltk.cxx rename to src/tools/oforms/oyranos_widgets_fltk.cxx diff --git a/src/examples/oforms/oyranos_widgets_fltk.h b/src/tools/oforms/oyranos_widgets_fltk.h similarity index 100% rename from src/examples/oforms/oyranos_widgets_fltk.h rename to src/tools/oforms/oyranos_widgets_fltk.h diff --git a/src/examples/oforms/oyranos_xforms.c b/src/tools/oforms/oyranos_xforms.c similarity index 100% rename from src/examples/oforms/oyranos_xforms.c rename to src/tools/oforms/oyranos_xforms.c diff --git a/src/examples/oforms/oyranos_xforms.makefile b/src/tools/oforms/oyranos_xforms.makefile similarity index 100% rename from src/examples/oforms/oyranos_xforms.makefile rename to src/tools/oforms/oyranos_xforms.makefile diff --git a/src/examples/oforms/oyranos_xforms_fltk.cxx b/src/tools/oforms/oyranos_xforms_fltk.cxx similarity index 100% rename from src/examples/oforms/oyranos_xforms_fltk.cxx rename to src/tools/oforms/oyranos_xforms_fltk.cxx diff --git a/src/examples/oforms/oyranos_xforms_modules.c b/src/tools/oforms/oyranos_xforms_modules.c similarity index 100% rename from src/examples/oforms/oyranos_xforms_modules.c rename to src/tools/oforms/oyranos_xforms_modules.c -- 2.10.2 ++++++ 0003-Make-tests-optional.patch ++++++ >From 4e45e9bd0a93581e17efd42caed0a643e5cfee4b Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner <[email protected]> Date: Sun, 1 Jan 2017 00:30:44 +0100 Subject: [PATCH 3/6] Make tests optional --- CMakeLists.txt | 2 ++ src/CMakeLists.txt | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 247eb7f..d0499f6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,6 +33,8 @@ SET( OYRANOS_VERSION_MAJORMINOR "${OYRANOS_VERSION_MAJOR}.${OYRANOS_VERSION_MINO include(GNUInstallDirs) +option(ENABLE_TESTS "Build tests (requires static libs)" ON) + IF( ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") SET(PLATFORM "OSX") ELSEIF( ${CMAKE_SYSTEM_NAME} MATCHES "Linux") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 395f941..76f3ccb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -301,7 +301,9 @@ ADD_SUBDIRECTORY( liboyranos ) ADD_SUBDIRECTORY( modules ) -ADD_SUBDIRECTORY( tests ) +IF(ENABLE_TESTS) + ADD_SUBDIRECTORY( tests ) +ENDIF() ADD_SUBDIRECTORY( tools ) -- 2.10.2 ++++++ 0004-Make-examples-optional.patch ++++++ >From 11f4bd00308c24c3dcd3fbc6b696f5a85dbed274 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner <[email protected]> Date: Sun, 1 Jan 2017 00:32:42 +0100 Subject: [PATCH 4/6] Make examples optional --- CMakeLists.txt | 1 + src/CMakeLists.txt | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d0499f6..7107840 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,6 +33,7 @@ SET( OYRANOS_VERSION_MAJORMINOR "${OYRANOS_VERSION_MAJOR}.${OYRANOS_VERSION_MINO include(GNUInstallDirs) +option(ENABLE_EXAMPLES "Build example applications" ON) option(ENABLE_TESTS "Build tests (requires static libs)" ON) IF( ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 76f3ccb..e513a5c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -307,7 +307,9 @@ ENDIF() ADD_SUBDIRECTORY( tools ) -ADD_SUBDIRECTORY( examples ) +IF(ENABLE_EXAMPLES) + ADD_SUBDIRECTORY( examples ) +ENDIF() # versions for libraries -- 2.10.2 ++++++ 0005-Make-static-libs-optional.patch ++++++ >From 41599f8f6ea96ef69c45e0392c06ef1906d5acda Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner <[email protected]> Date: Sun, 1 Jan 2017 00:59:09 +0100 Subject: [PATCH 5/6] Make static libs optional --- CMakeLists.txt | 5 +++++ src/liboyranos/CMakeLists.txt | 22 +++++++++++++++++----- src/liboyranos_config/CMakeLists.txt | 20 +++++++++++++++----- src/liboyranos_core/CMakeLists.txt | 18 +++++++++++++++--- src/liboyranos_modules/CMakeLists.txt | 21 ++++++++++++++++----- src/liboyranos_object/CMakeLists.txt | 21 ++++++++++++++++----- 6 files changed, 84 insertions(+), 23 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7107840..130fd68 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,8 +34,13 @@ SET( OYRANOS_VERSION_MAJORMINOR "${OYRANOS_VERSION_MAJOR}.${OYRANOS_VERSION_MINO include(GNUInstallDirs) option(ENABLE_EXAMPLES "Build example applications" ON) +option(ENABLE_STATIC_LIBS "Build static libs" ON) option(ENABLE_TESTS "Build tests (requires static libs)" ON) +IF( ENABLE_TESTS ) + SET(ENABLE_STATIC_LIBS ON) +ENDIF() + IF( ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") SET(PLATFORM "OSX") ELSEIF( ${CMAKE_SYSTEM_NAME} MATCHES "Linux") diff --git a/src/liboyranos/CMakeLists.txt b/src/liboyranos/CMakeLists.txt index ba550e6..0e031b7 100644 --- a/src/liboyranos/CMakeLists.txt +++ b/src/liboyranos/CMakeLists.txt @@ -68,10 +68,6 @@ ADD_LIBRARY( ${PROJECT_NAME} SHARED ${SOURCES} ${CHEADERS_OBJECT_IMAGING_PUBLIC} TARGET_LINK_LIBRARIES ( ${PROJECT_NAME} ${PROJECT_NAME}Config ${PROJECT_NAME}Modules ${PROJECT_NAME}Object ${PROJECT_NAME}Core ${EXTRA_LIBS} ) -ADD_LIBRARY( oyranos-static STATIC ${SOURCES} ${CHEADERS_OBJECT_IMAGING_PUBLIC} ) -TARGET_LINK_LIBRARIES ( - oyranos-static - oyranos_config-static oyranos_modules-static oyranos_object-static oyranos_core-static ${EXTRA_LIBS} ) # OS X Framework FOREACH( policy ${SETTINGS_PUBLIC} ) @@ -95,7 +91,7 @@ SET_TARGET_PROPERTIES( ${PROJECT_NAME} PROPERTIES # DEBUG_POSTFIX -d ) -INSTALL( TARGETS ${PROJECT_NAME} oyranos-static +INSTALL( TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} FRAMEWORK DESTINATION ${FRAMEWORK_DIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} @@ -104,6 +100,22 @@ INSTALL( TARGETS ${PROJECT_NAME} oyranos-static RESOURCE DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/color/settings ) +IF(ENABLE_STATIC_LIBS) + ADD_LIBRARY( oyranos-static STATIC ${SOURCES} ${CHEADERS_OBJECT_IMAGING_PUBLIC} ) + TARGET_LINK_LIBRARIES ( + oyranos-static + oyranos_config-static oyranos_modules-static oyranos_object-static oyranos_core-static ${EXTRA_LIBS} ) + + INSTALL(TARGETS oyranos-static + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + FRAMEWORK DESTINATION ${FRAMEWORK_DIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PACKAGE_NAME} + RESOURCE DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/color/settings + ) +ENDIF() + # install for all but app bundles INSTALL( FILES ${SETTINGS_PUBLIC} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/color/settings diff --git a/src/liboyranos_config/CMakeLists.txt b/src/liboyranos_config/CMakeLists.txt index 0e223c2..5e81c0e 100644 --- a/src/liboyranos_config/CMakeLists.txt +++ b/src/liboyranos_config/CMakeLists.txt @@ -80,10 +80,6 @@ ADD_LIBRARY( ${PROJECT_NAME}Config SHARED ${SOURCES} ) TARGET_LINK_LIBRARIES ( ${PROJECT_NAME}Config ${PROJECT_NAME}Modules ${PROJECT_NAME}Object ${PROJECT_NAME}Core ${EXTRA_LIBS_CONFIG} ${EXTRA_LIBS_CS} ) -ADD_LIBRARY( oyranos_config-static STATIC ${SOURCES} ) -TARGET_LINK_LIBRARIES ( - oyranos_config-static - oyranos_modules-static oyranos_object-static oyranos_core-static ${EXTRA_LIBS_CONFIG} ${EXTRA_LIBS_CS} ) # OS X Framework SET_TARGET_PROPERTIES( ${PROJECT_NAME}Config PROPERTIES @@ -96,7 +92,7 @@ SET_TARGET_PROPERTIES( ${PROJECT_NAME}Config PROPERTIES # DEBUG_POSTFIX -d ) -INSTALL( TARGETS ${PROJECT_NAME}Config oyranos_config-static +INSTALL( TARGETS ${PROJECT_NAME}Config RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} FRAMEWORK DESTINATION ${FRAMEWORK_DIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} @@ -104,3 +100,17 @@ INSTALL( TARGETS ${PROJECT_NAME}Config oyranos_config-static PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PACKAGE_NAME} ) +IF(ENABLE_STATIC_LIBS) + ADD_LIBRARY( oyranos_config-static STATIC ${SOURCES} ) + TARGET_LINK_LIBRARIES ( + oyranos_config-static + oyranos_modules-static oyranos_object-static oyranos_core-static ${EXTRA_LIBS_CONFIG} ${EXTRA_LIBS_CS} ) + + INSTALL( TARGETS oyranos_config-static + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + FRAMEWORK DESTINATION ${FRAMEWORK_DIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PACKAGE_NAME} + ) +ENDIF() diff --git a/src/liboyranos_core/CMakeLists.txt b/src/liboyranos_core/CMakeLists.txt index 078a4ce..73aa3c3 100644 --- a/src/liboyranos_core/CMakeLists.txt +++ b/src/liboyranos_core/CMakeLists.txt @@ -38,8 +38,6 @@ SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_CORE}" ) ADD_LIBRARY( ${PROJECT_NAME}Core SHARED ${SOURCES} ) TARGET_LINK_LIBRARIES ( ${PROJECT_NAME}Core ${EXTRA_LIBS_CORE} ) -ADD_LIBRARY( oyranos_core-static STATIC ${SOURCES}) -TARGET_LINK_LIBRARIES ( oyranos_core-static ${EXTRA_LIBS_CORE} ) # OS X Framework SET_TARGET_PROPERTIES( ${PROJECT_NAME}Core PROPERTIES @@ -52,7 +50,7 @@ SET_TARGET_PROPERTIES( ${PROJECT_NAME}Core PROPERTIES # DEBUG_POSTFIX -d ) -INSTALL( TARGETS ${PROJECT_NAME}Core oyranos_core-static +INSTALL( TARGETS ${PROJECT_NAME}Core RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} FRAMEWORK DESTINATION ${FRAMEWORK_DIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} @@ -61,6 +59,20 @@ INSTALL( TARGETS ${PROJECT_NAME}Core oyranos_core-static RESOURCE DESTINATION ${FRAMEWORK_DIR} ) +IF(ENABLE_STATIC_LIBS) + ADD_LIBRARY( oyranos_core-static STATIC ${SOURCES}) + TARGET_LINK_LIBRARIES ( oyranos_core-static ${EXTRA_LIBS_CORE} ) + + INSTALL( TARGETS oyranos_core-static + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + FRAMEWORK DESTINATION ${FRAMEWORK_DIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PACKAGE_NAME} + RESOURCE DESTINATION ${FRAMEWORK_DIR} + ) +ENDIF() + IF( USE_GETTEXT ) MESSAGE( "-- OY_LINGUAS: ${OY_LINGUAS}" ) IF(APPLE) diff --git a/src/liboyranos_modules/CMakeLists.txt b/src/liboyranos_modules/CMakeLists.txt index ded32e7..0f33788 100644 --- a/src/liboyranos_modules/CMakeLists.txt +++ b/src/liboyranos_modules/CMakeLists.txt @@ -118,10 +118,6 @@ ADD_LIBRARY( ${PROJECT_NAME}Modules SHARED ${SOURCES} ) TARGET_LINK_LIBRARIES ( ${PROJECT_NAME}Modules ${PROJECT_NAME}Object ${PROJECT_NAME}Core ${EXTRA_LIBS} ) -ADD_LIBRARY( oyranos_modules-static STATIC ${SOURCES} ) -TARGET_LINK_LIBRARIES ( - oyranos_modules-static - oyranos_object-static oyranos_core-static ${EXTRA_LIBS} ) # OS X Framework SET_TARGET_PROPERTIES( ${PROJECT_NAME}Modules PROPERTIES @@ -134,10 +130,25 @@ SET_TARGET_PROPERTIES( ${PROJECT_NAME}Modules PROPERTIES # DEBUG_POSTFIX -d ) -INSTALL( TARGETS ${PROJECT_NAME}Modules oyranos_modules-static +INSTALL( TARGETS ${PROJECT_NAME}Modules RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} FRAMEWORK DESTINATION ${FRAMEWORK_DIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PACKAGE_NAME} ) + +IF(ENABLE_STATIC_LIBS) + ADD_LIBRARY( oyranos_modules-static STATIC ${SOURCES} ) + TARGET_LINK_LIBRARIES ( + oyranos_modules-static + oyranos_object-static oyranos_core-static ${EXTRA_LIBS} ) + + INSTALL( TARGETS oyranos_modules-static + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + FRAMEWORK DESTINATION ${FRAMEWORK_DIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PACKAGE_NAME} + ) +ENDIF() diff --git a/src/liboyranos_object/CMakeLists.txt b/src/liboyranos_object/CMakeLists.txt index 0e0e7c9..a11e6aa 100644 --- a/src/liboyranos_object/CMakeLists.txt +++ b/src/liboyranos_object/CMakeLists.txt @@ -87,10 +87,6 @@ ADD_LIBRARY( ${PROJECT_NAME}Object SHARED ${SOURCES} ) TARGET_LINK_LIBRARIES ( ${PROJECT_NAME}Object ${PROJECT_NAME}Core ${EXTRA_LIBS_CORE} ) -ADD_LIBRARY( oyranos_object-static STATIC ${SOURCES} ) -TARGET_LINK_LIBRARIES ( - oyranos_object-static - oyranos_core-static ${EXTRA_LIBS_CORE} ) # OS X Framework SET_TARGET_PROPERTIES( ${PROJECT_NAME}Object PROPERTIES @@ -103,10 +99,25 @@ SET_TARGET_PROPERTIES( ${PROJECT_NAME}Object PROPERTIES # DEBUG_POSTFIX -d ) -INSTALL( TARGETS ${PROJECT_NAME}Object oyranos_object-static +INSTALL( TARGETS ${PROJECT_NAME}Object RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} FRAMEWORK DESTINATION ${FRAMEWORK_DIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PACKAGE_NAME} ) + +IF(ENABLE_STATIC_LIBS) + ADD_LIBRARY( oyranos_object-static STATIC ${SOURCES} ) + TARGET_LINK_LIBRARIES ( + oyranos_object-static + oyranos_core-static ${EXTRA_LIBS_CORE} ) + + INSTALL( TARGETS oyranos_object-static + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + FRAMEWORK DESTINATION ${FRAMEWORK_DIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PACKAGE_NAME} + ) +ENDIF() -- 2.10.2 ++++++ 0006-Use-FindFLTK-shipped-by-cmake.patch ++++++ >From 05ac30bb579adcf81dda5642f690bebe05d7acf0 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner <[email protected]> Date: Sun, 1 Jan 2017 15:07:26 +0100 Subject: [PATCH 6/6] Use FindFLTK shipped by cmake Dropping FindFltk copy from cmake/Modules. --- cmake/Modules/FindFltk.cmake | 335 ------------------------------------------- src/CMakeLists.txt | 6 +- 2 files changed, 3 insertions(+), 338 deletions(-) delete mode 100644 cmake/Modules/FindFltk.cmake diff --git a/cmake/Modules/FindFltk.cmake b/cmake/Modules/FindFltk.cmake deleted file mode 100644 index f147d90..0000000 --- a/cmake/Modules/FindFltk.cmake +++ /dev/null @@ -1,335 +0,0 @@ -# - Find the native FLTK includes and library -# -# By default FindFLTK.cmake will search for all of the FLTK components and -# add them to the FLTK_LIBRARIES variable. -# -# You can limit the components which get placed in FLTK_LIBRARIES by -# defining one or more of the following three options: -# -# FLTK_SKIP_OPENGL, set to true to disable searching for opengl and -# the FLTK GL library -# FLTK_SKIP_FORMS, set to true to disable searching for fltk_forms -# FLTK_SKIP_IMAGES, set to true to disable searching for fltk_images -# -# FLTK_SKIP_FLUID, set to true if the fluid binary need not be present -# at build time -# -# The following variables will be defined: -# FLTK_FOUND, True if all components not skipped were found -# FLTK_INCLUDE_DIR, where to find include files -# FLTK_LIBRARIES, list of fltk libraries you should link against -# FLTK_FLUID_EXECUTABLE, where to find the Fluid tool -# FLTK_WRAP_UI, This enables the FLTK_WRAP_UI command -# -# The following cache variables are assigned but should not be used. -# See the FLTK_LIBRARIES variable instead. -# -# FLTK_BASE_LIBRARY = the full path to fltk.lib -# FLTK_GL_LIBRARY = the full path to fltk_gl.lib -# FLTK_FORMS_LIBRARY = the full path to fltk_forms.lib -# FLTK_IMAGES_LIBRARY = the full path to fltk_images.lib - -#============================================================================= -# Copyright 2001-2009 Kitware, Inc. -# Copyright 2012 Kai-Uwe Behrmann -# -# Distributed under the OSI-approved BSD License (the "License"); -# see accompanying file Copyright.txt for details. -# -# This software is distributed WITHOUT ANY WARRANTY; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the License for more information. -#============================================================================= -# (To distribute this file outside of CMake, substitute the full -# License text for the above reference.) - -IF(NOT FLTK_SKIP_OPENGL) - FIND_PACKAGE(OpenGL) -ENDIF() - -# Platform dependent libraries required by FLTK -IF(WIN32) - IF(NOT CYGWIN) - IF(BORLAND) - SET( FLTK_PLATFORM_DEPENDENT_LIBS import32 ) - ELSE(BORLAND) - SET( FLTK_PLATFORM_DEPENDENT_LIBS wsock32 comctl32 ) - ENDIF(BORLAND) - ENDIF(NOT CYGWIN) -ENDIF(WIN32) - -IF(UNIX) - INCLUDE(FindX11) - FIND_LIBRARY(FLTK_MATH_LIBRARY m) - SET( FLTK_PLATFORM_DEPENDENT_LIBS ${X11_LIBRARIES} ${FLTK_MATH_LIBRARY}) -ENDIF(UNIX) - -IF(APPLE) - SET( FLTK_PLATFORM_DEPENDENT_LIBS "-framework Carbon -framework Cocoa -framework ApplicationServices -lz") -ENDIF(APPLE) - -# If FLTK_INCLUDE_DIR is already defined we assigne its value to FLTK_DIR -IF(FLTK_INCLUDE_DIR) - SET(FLTK_DIR ${FLTK_INCLUDE_DIR}) -ENDIF(FLTK_INCLUDE_DIR) - - -# If FLTK has been built using CMake we try to find everything directly -SET(FLTK_DIR_STRING "directory containing FLTKConfig.cmake. This is either the root of the build tree, or PREFIX/lib/fltk for an installation.") - -# Search only if the location is not already known. -IF(NOT FLTK_DIR) - # Get the system search path as a list. - IF(UNIX) - STRING(REGEX MATCHALL "[^:]+" FLTK_DIR_SEARCH1 "$ENV{PATH}") - ELSE(UNIX) - STRING(REGEX REPLACE "\\\\" "/" FLTK_DIR_SEARCH1 "$ENV{PATH}") - ENDIF(UNIX) - STRING(REGEX REPLACE "/;" ";" FLTK_DIR_SEARCH2 ${FLTK_DIR_SEARCH1}) - - # Construct a set of paths relative to the system search path. - SET(FLTK_DIR_SEARCH "") - FOREACH(dir ${FLTK_DIR_SEARCH2}) - SET(FLTK_DIR_SEARCH ${FLTK_DIR_SEARCH} "${dir}/../lib/fltk") - ENDFOREACH(dir) - - # - # Look for an installation or build tree. - # - FIND_PATH(FLTK_DIR FLTKConfig.cmake - # Look for an environment variable FLTK_DIR. - $ENV{FLTK_DIR} - - # Look in places relative to the system executable search path. - ${FLTK_DIR_SEARCH} - - # Look in standard UNIX install locations. - /usr/local/lib/fltk - /usr/lib/fltk - /usr/local/include - /usr/include - /usr/local/fltk - /usr/X11R6/include - - # Read from the CMakeSetup registry entries. It is likely that - # FLTK will have been recently built. - # TODO: Is this really a good idea? I can already hear the user screaming, "But - # it worked when I configured the build LAST week!" - [HKEY_CURRENT_USER\\Software\\Kitware\\CMakeSetup\\Settings\\StartPath;WhereBuild1] - [HKEY_CURRENT_USER\\Software\\Kitware\\CMakeSetup\\Settings\\StartPath;WhereBuild2] - [HKEY_CURRENT_USER\\Software\\Kitware\\CMakeSetup\\Settings\\StartPath;WhereBuild3] - [HKEY_CURRENT_USER\\Software\\Kitware\\CMakeSetup\\Settings\\StartPath;WhereBuild4] - [HKEY_CURRENT_USER\\Software\\Kitware\\CMakeSetup\\Settings\\StartPath;WhereBuild5] - [HKEY_CURRENT_USER\\Software\\Kitware\\CMakeSetup\\Settings\\StartPath;WhereBuild6] - [HKEY_CURRENT_USER\\Software\\Kitware\\CMakeSetup\\Settings\\StartPath;WhereBuild7] - [HKEY_CURRENT_USER\\Software\\Kitware\\CMakeSetup\\Settings\\StartPath;WhereBuild8] - [HKEY_CURRENT_USER\\Software\\Kitware\\CMakeSetup\\Settings\\StartPath;WhereBuild9] - [HKEY_CURRENT_USER\\Software\\Kitware\\CMakeSetup\\Settings\\StartPath;WhereBuild10] - - # Help the user find it if we cannot. - DOC "The ${FLTK_DIR_STRING}" - ) -ENDIF(NOT FLTK_DIR) - - # Check if FLTK was built using CMake - IF(EXISTS ${FLTK_DIR}/FLTKConfig.cmake) - SET(FLTK_BUILT_WITH_CMAKE 1) - ENDIF(EXISTS ${FLTK_DIR}/FLTKConfig.cmake) - - IF(FLTK_BUILT_WITH_CMAKE) - SET(FLTK_FOUND 1) - INCLUDE(${FLTK_DIR}/FLTKConfig.cmake) - - # Fluid - IF(FLUID_COMMAND) - SET(FLTK_FLUID_EXECUTABLE ${FLUID_COMMAND} CACHE FILEPATH "Fluid executable") - ELSE(FLUID_COMMAND) - FIND_PROGRAM(FLTK_FLUID_EXECUTABLE fluid PATHS - ${FLTK_EXECUTABLE_DIRS} - ${FLTK_EXECUTABLE_DIRS}/RelWithDebInfo - ${FLTK_EXECUTABLE_DIRS}/Debug - ${FLTK_EXECUTABLE_DIRS}/Release - NO_SYSTEM_PATH) - ENDIF(FLUID_COMMAND) - # MARK_AS_ADVANCED(FLTK_FLUID_EXECUTABLE) - - SET(FLTK_INCLUDE_DIR ${FLTK_DIR}) - LINK_DIRECTORIES(${FLTK_LIBRARY_DIRS}) - - SET(FLTK_BASE_LIBRARY fltk) - SET(FLTK_GL_LIBRARY fltk_gl) - SET(FLTK_FORMS_LIBRARY fltk_forms) - SET(FLTK_IMAGES_LIBRARY fltk_images) - - # Add the extra libraries - LOAD_CACHE(${FLTK_DIR} - READ_WITH_PREFIX - FL FLTK_USE_SYSTEM_JPEG - FL FLTK_USE_SYSTEM_PNG - FL FLTK_USE_SYSTEM_ZLIB - ) - - SET(FLTK_IMAGES_LIBS "") - IF(FLFLTK_USE_SYSTEM_JPEG) - SET(FLTK_IMAGES_LIBS ${FLTK_IMAGES_LIBS} fltk_jpeg) - ENDIF(FLFLTK_USE_SYSTEM_JPEG) - IF(FLFLTK_USE_SYSTEM_PNG) - SET(FLTK_IMAGES_LIBS ${FLTK_IMAGES_LIBS} fltk_png) - ENDIF(FLFLTK_USE_SYSTEM_PNG) - IF(FLFLTK_USE_SYSTEM_ZLIB) - SET(FLTK_IMAGES_LIBS ${FLTK_IMAGES_LIBS} fltk_zlib) - ENDIF(FLFLTK_USE_SYSTEM_ZLIB) - SET(FLTK_IMAGES_LIBS "${FLTK_IMAGES_LIBS}" CACHE INTERNAL - "Extra libraries for fltk_images library.") - - ELSE(FLTK_BUILT_WITH_CMAKE) - - # if FLTK was not built using CMake - # Find fluid executable. - FIND_PROGRAM(FLTK_FLUID_EXECUTABLE fluid ${FLTK_INCLUDE_DIR}/fluid) - - # Use location of fluid to help find everything else. - SET(FLTK_INCLUDE_SEARCH_PATH "") - SET(FLTK_LIBRARY_SEARCH_PATH "") - IF(FLTK_FLUID_EXECUTABLE) - GET_FILENAME_COMPONENT(FLTK_BIN_DIR "${FLTK_FLUID_EXECUTABLE}" PATH) - SET(FLTK_INCLUDE_SEARCH_PATH ${FLTK_INCLUDE_SEARCH_PATH} - ${FLTK_BIN_DIR}/../include ${FLTK_BIN_DIR}/..) - SET(FLTK_LIBRARY_SEARCH_PATH ${FLTK_LIBRARY_SEARCH_PATH} - ${FLTK_BIN_DIR}/../lib) - SET(FLTK_WRAP_UI 1) - ENDIF(FLTK_FLUID_EXECUTABLE) - - # - # Try to find FLTK include dir using fltk-config - # - IF(UNIX) - # Use fltk-config to generate a list of possible include directories - FIND_PROGRAM(FLTK_CONFIG_SCRIPT fltk-config PATHS ${FLTK_BIN_DIR}) - IF(FLTK_CONFIG_SCRIPT) - IF(NOT FLTK_INCLUDE_DIR) - EXEC_PROGRAM(${FLTK_CONFIG_SCRIPT} ARGS --cxxflags OUTPUT_VARIABLE FLTK_CXXFLAGS) - IF(FLTK_CXXFLAGS) - STRING(REGEX MATCHALL "-I[^ ]*" _fltk_temp_dirs ${FLTK_CXXFLAGS}) - STRING(REPLACE "-I" "" _fltk_temp_dirs "${_fltk_temp_dirs}") - FOREACH(_dir ${_fltk_temp_dirs}) - STRING(STRIP ${_dir} _output) - LIST(APPEND _FLTK_POSSIBLE_INCLUDE_DIRS ${_output}) - ENDFOREACH() - ENDIF(FLTK_CXXFLAGS) - ENDIF() - ENDIF() - ENDIF() - - SET(FLTK_INCLUDE_SEARCH_PATH ${FLTK_INCLUDE_SEARCH_PATH} - /usr/local/fltk - /usr/X11R6/include - ${_FLTK_POSSIBLE_INCLUDE_DIRS} - ) - - FIND_PATH(FLTK_INCLUDE_DIR - NAMES FL/Fl.h FL/Fl.H # fltk 1.1.9 has Fl.H (#8376) - PATHS ${FLTK_INCLUDE_SEARCH_PATH}) - - # - # Try to find FLTK library - IF(UNIX) - IF(FLTK_CONFIG_SCRIPT) - EXEC_PROGRAM(${FLTK_CONFIG_SCRIPT} ARGS --libs OUTPUT_VARIABLE _FLTK_POSSIBLE_LIBS) - IF(_FLTK_POSSIBLE_LIBS) - GET_FILENAME_COMPONENT(_FLTK_POSSIBLE_LIBRARY_DIR ${_FLTK_POSSIBLE_LIBS} PATH) - ENDIF() - ENDIF() - ENDIF() - - SET(FLTK_LIBRARY_SEARCH_PATH ${FLTK_LIBRARY_SEARCH_PATH} - /usr/local/fltk/lib - /usr/X11R6/lib - ${FLTK_INCLUDE_DIR}/lib - ${_FLTK_POSSIBLE_LIBRARY_DIR} - ) - - FIND_LIBRARY(FLTK_BASE_LIBRARY NAMES fltk fltkd - PATHS ${FLTK_LIBRARY_SEARCH_PATH}) - FIND_LIBRARY(FLTK_GL_LIBRARY NAMES fltkgl fltkgld fltk_gl - PATHS ${FLTK_LIBRARY_SEARCH_PATH}) - FIND_LIBRARY(FLTK_FORMS_LIBRARY NAMES fltkforms fltkformsd fltk_forms - PATHS ${FLTK_LIBRARY_SEARCH_PATH}) - FIND_LIBRARY(FLTK_IMAGES_LIBRARY NAMES fltkimages fltkimagesd fltk_images - PATHS ${FLTK_LIBRARY_SEARCH_PATH}) - - # Find the extra libraries needed for the fltk_images library. - IF(UNIX) - IF(FLTK_CONFIG_SCRIPT) - EXEC_PROGRAM(${FLTK_CONFIG_SCRIPT} ARGS --ldflags - OUTPUT_VARIABLE FLTK_LDFLAGS) - SET(FLTK_LIBS_EXTRACT_REGEX "-lfltk.*") - IF("${FLTK_LDFLAGS}" MATCHES "${FLTK_LIBS_EXTRACT_REGEX}") - STRING(REGEX REPLACE "${FLTK_LIBS_EXTRACT_REGEX}" "" - FLTK_LIBS "${FLTK_LDFLAGS}") - STRING(REGEX REPLACE " +" ";" FLTK_LIBS "${FLTK_LIBS}") - # The EXEC_PROGRAM will not be inherited into subdirectories from - # the file that originally included this module. Save the answer. - SET(FLTK_LIBS "${FLTK_LIBS}" CACHE INTERNAL - "Extra libraries for fltk library.") - ENDIF("${FLTK_LDFLAGS}" MATCHES "${FLTK_LIBS_EXTRACT_REGEX}") - ENDIF(FLTK_CONFIG_SCRIPT) - ENDIF(UNIX) - - # Find the extra libraries needed for the fltk_images library. - IF(UNIX) - IF(FLTK_CONFIG_SCRIPT) - EXEC_PROGRAM(${FLTK_CONFIG_SCRIPT} ARGS --use-images --ldflags - OUTPUT_VARIABLE FLTK_IMAGES_LDFLAGS) - SET(FLTK_LIBS_EXTRACT_REGEX ".*-lfltk_images (.*) -lfltk.*") - IF("${FLTK_IMAGES_LDFLAGS}" MATCHES "${FLTK_LIBS_EXTRACT_REGEX}") - STRING(REGEX REPLACE "${FLTK_LIBS_EXTRACT_REGEX}" "\\1" - FLTK_IMAGES_LIBS "${FLTK_IMAGES_LDFLAGS}") - STRING(REGEX REPLACE " +" ";" FLTK_IMAGES_LIBS "${FLTK_IMAGES_LIBS}") - # The EXEC_PROGRAM will not be inherited into subdirectories from - # the file that originally included this module. Save the answer. - SET(FLTK_IMAGES_LIBS "${FLTK_IMAGES_LIBS}" CACHE INTERNAL - "Extra libraries for fltk_images library.") - ENDIF("${FLTK_IMAGES_LDFLAGS}" MATCHES "${FLTK_LIBS_EXTRACT_REGEX}") - ENDIF(FLTK_CONFIG_SCRIPT) - ENDIF(UNIX) - - ENDIF(FLTK_BUILT_WITH_CMAKE) - - # Append all of the required libraries together (by default, everything) - SET(FLTK_LIBRARIES) - IF(NOT FLTK_SKIP_IMAGES) - LIST(APPEND FLTK_LIBRARIES ${FLTK_IMAGES_LIBRARY}) - ENDIF() - IF(NOT FLTK_SKIP_FORMS) - LIST(APPEND FLTK_LIBRARIES ${FLTK_FORMS_LIBRARY}) - ENDIF() - IF(NOT FLTK_SKIP_OPENGL) - LIST(APPEND FLTK_LIBRARIES ${FLTK_GL_LIBRARY} ${OPENGL_gl_LIBRARY}) - LIST(APPEND FLTK_INCLUDE_DIR ${OPENGL_INCLUDE_DIR}) - LIST(REMOVE_DUPLICATES FLTK_INCLUDE_DIR) - ENDIF() - LIST(APPEND FLTK_LIBRARIES ${FLTK_BASE_LIBRARY}) - LIST(APPEND FLTK_LIBRARIES ${FLTK_LDFLAGS}) - -INCLUDE(FindPackageHandleStandardArgs) -IF(FLTK_SKIP_FLUID) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(FLTK DEFAULT_MSG FLTK_LIBRARIES FLTK_INCLUDE_DIR) -ELSE() - FIND_PACKAGE_HANDLE_STANDARD_ARGS(FLTK DEFAULT_MSG FLTK_LIBRARIES FLTK_INCLUDE_DIR FLTK_FLUID_EXECUTABLE) -ENDIF() - -IF(FLTK_FOUND) - IF(APPLE) - SET(FLTK_LIBRARIES ${FLTK_PLATFORM_DEPENDENT_LIBS} ${FLTK_LIBRARIES}) - ELSE(APPLE) - SET(FLTK_LIBRARIES ${FLTK_LIBRARIES} ${FLTK_PLATFORM_DEPENDENT_LIBS}) - ENDIF(APPLE) - - # The following deprecated settings are for compatibility with CMake 1.4 - SET (HAS_FLTK ${FLTK_FOUND}) - SET (FLTK_INCLUDE_PATH ${FLTK_INCLUDE_DIR}) - SET (FLTK_FLUID_EXE ${FLTK_FLUID_EXECUTABLE}) - SET (FLTK_LIBRARY ${FLTK_LIBRARIES}) -ENDIF(FLTK_FOUND) - diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e513a5c..328564b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -154,12 +154,12 @@ IF(HAVE_CAIRO) LINK_DIRECTORIES( ${CAIRO_LIBRARY_DIRS} ) ENDIF(HAVE_CAIRO) -FIND_PACKAGE( Fltk ) +FIND_PACKAGE( FLTK ) IF(FLTK_FOUND) SET( HAVE_FLTK 1 ) SET( HAVE_FLTK ${HAVE_FLTK} PARENT_SCOPE ) - INCLUDE_DIRECTORIES( ${FLTK_INCLUDE_DIRS} ) - LINK_DIRECTORIES( ${FLTK_LIBRARY_DIRS} ) + INCLUDE_DIRECTORIES( ${FLTK_INCLUDE_DIR} ) + LINK_DIRECTORIES( ${FLTK_LIBRARIES} ) ENDIF(FLTK_FOUND) FIND_PACKAGE(LibXml2) -- 2.10.2 ++++++ 0007-No-undefined.patch ++++++ Index: oyranos-0.9.6/src/modules/color/modules/CMakeLists.txt =================================================================== --- oyranos-0.9.6.orig/src/modules/color/modules/CMakeLists.txt +++ oyranos-0.9.6/src/modules/color/modules/CMakeLists.txt @@ -74,9 +74,9 @@ SET( OY_MODULE oydi ) SET( OY_MODULE_LIB ${PACKAGE_NAME}_${OY_MODULE}${OY_MODULE_NAME} ) ADD_LIBRARY( ${OY_MODULE_LIB} SHARED ${PACKAGE_NAME}_cmm_${OY_MODULE}.c ) -TARGET_LINK_LIBRARIES ( ${OY_MODULE_LIB} ${PROJECT_NAME} ${EXTRA_LIBS} ${XCM_LIBRARIES} ${XFIXES_LIBRARIES} ) +TARGET_LINK_LIBRARIES ( ${OY_MODULE_LIB} ${PROJECT_NAME} ${EXTRA_LIBS} ${XCM_LIBRARIES} ${XFIXES_LIBRARIES} ${X11_LIBRARIES} ) INSTALL (TARGETS ${OY_MODULE_LIB} DESTINATION ${CMAKE_INSTALL_LIBDIR}/${OY_CMMSUBPATH}) -SET( OY_MODULE_LIBRARIES ${OY_MODULE_LIBRARIES} ${XCM_LIBRARIES} ${XFIXES_LIBRARIES} ) +SET( OY_MODULE_LIBRARIES ${OY_MODULE_LIBRARIES} ${XCM_LIBRARIES} ${XFIXES_LIBRARIES} ${X11_LIBRARIES} ) SET( OY_MODULE oyra ) SET( OY_MODULE_LIB ${PACKAGE_NAME}_${OY_MODULE}${OY_MODULE_NAME} )
