.../696d16ae6c5214e314cfc7cb809c2e574bcff651.patch | 29 + .gear/CMakeCache.txt | 3 + .gear/alt-fallback-modules-dir.patch | 28 + .gear/cmake.macros | 41 ++ .gear/cmake.spec | 723 +++++++++++++++++++++ .gear/rules | 6 + .../tags/a124950a02fcc6497c807aac670c70e63b86e3cf | 23 + .gear/tags/list | 1 + CMakeLists.txt | 2 +- CompileFlags.cmake | 9 + Modules/Compiler/Absoft-Fortran.cmake | 2 +- Modules/Compiler/G95-Fortran.cmake | 2 +- Modules/Compiler/GNU-Fortran.cmake | 2 +- Modules/Compiler/GNU.cmake | 2 +- Modules/Compiler/Intel.cmake | 2 +- Modules/Compiler/NVIDIA-CUDA.cmake | 2 +- Modules/Compiler/PGI.cmake | 2 +- Modules/Compiler/PathScale.cmake | 2 +- Source/CMakeLists.txt | 11 + Source/CursesDialog/form/CMakeLists.txt | 3 + Source/QtDialog/cmake-gui.desktop | 2 +- Utilities/cmzlib/CMakeLists.txt | 3 + 22 files changed, 890 insertions(+), 10 deletions(-) diff --git a/.gear/696d16ae6c5214e314cfc7cb809c2e574bcff651.patch b/.gear/696d16ae6c5214e314cfc7cb809c2e574bcff651.patch new file mode 100644 index 0000000000..afe521e4fa --- /dev/null +++ b/.gear/696d16ae6c5214e314cfc7cb809c2e574bcff651.patch @@ -0,0 +1,29 @@ +From 696d16ae6c5214e314cfc7cb809c2e574bcff651 Mon Sep 17 00:00:00 2001 +From: Brad King +Date: Fri, 25 Sep 2020 12:04:34 -0400 +Subject: [PATCH] FindJNI: Add aarch64 support + +Extend the fix from commit 44dffbcc94 (FindJNI: Add arm64 support, +2020-08-25, v3.18.3~21^2) to cover the `aarch64` name too. + +Fixes: #21237 +--- + Modules/FindJNI.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake +index eff815ddc8..bbca952866 100644 +--- a/Modules/FindJNI.cmake ++++ b/Modules/FindJNI.cmake +@@ -60,7 +60,7 @@ macro(java_append_library_directories _var) + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^i.86$") + set(_java_libarch "i386") + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64") +- set(_java_libarch "arm64") ++ set(_java_libarch "arm64" "aarch64") + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^alpha") + set(_java_libarch "alpha") + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") +-- +GitLab + diff --git a/.gear/CMakeCache.txt b/.gear/CMakeCache.txt new file mode 100644 index 0000000000..c82d7ec82a --- /dev/null +++ b/.gear/CMakeCache.txt @@ -0,0 +1,3 @@ +CMAKE_VERBOSE_MAKEFILE:BOOL=ON +BUILD_DOCUMENTATION:BOOL=ON +CTEST_CONFIGURATION_TYPE=Release diff --git a/.gear/alt-fallback-modules-dir.patch b/.gear/alt-fallback-modules-dir.patch new file mode 100644 index 0000000000..2f826b7c65 --- /dev/null +++ b/.gear/alt-fallback-modules-dir.patch @@ -0,0 +1,28 @@ +--- a/Source/cmMakefile.cxx~ 2017-09-07 19:14:26.000000000 +0300 ++++ b/Source/cmMakefile.cxx 2017-10-23 12:55:36.616269687 +0300 +@@ -3359,6 +3359,25 @@ std::string cmMakefile::GetModulesFile(c + } + } + ++ { ++ const char* cmakeModulePathFallback = "/usr/share/CMake/Modules"; ++ std::vector modulePath; ++ cmExpandList(cmakeModulePathFallback, modulePath); ++ ++ // Look through the possible module directories. ++ for (std::vector::iterator i = modulePath.begin(); ++ i != modulePath.end(); ++i) { ++ std::string itempl = *i; ++ cmSystemTools::ConvertToUnixSlashes(itempl); ++ itempl += "/"; ++ itempl += filename; ++ if (cmSystemTools::FileExists(itempl.c_str())) { ++ moduleInCMakeModulePath = itempl; ++ break; ++ } ++ } ++ } ++ + // Always search in the standard modules location. + moduleInCMakeRoot = cmSystemTools::GetCMakeRoot(); + moduleInCMakeRoot += "/Modules/"; diff --git a/.gear/cmake.macros b/.gear/cmake.macros new file mode 100644 index 0000000000..8264055e6c --- /dev/null +++ b/.gear/cmake.macros @@ -0,0 +1,41 @@ +# Macros for cmake +# +%__cmake cmake +%_cmake__builddir %_target_platform +%_cmake_skip_rpath -DCMAKE_SKIP_RPATH:BOOL=ON + +%cmake \ + mkdir -p %_cmake__builddir; \ + %__cmake \\\ + -DCMAKE_SKIP_INSTALL_RPATH:BOOL=yes \\\ + -DCMAKE_C_FLAGS:STRING='%optflags' \\\ + -DCMAKE_CXX_FLAGS:STRING='%optflags' \\\ + -DCMAKE_Fortran_FLAGS:STRING='%optflags' \\\ + -DCMAKE_INSTALL_PREFIX=%prefix \\\ + -DINCLUDE_INSTALL_DIR:PATH=%_includedir \\\ + -DLIB_INSTALL_DIR:PATH=%_libdir \\\ + -DSYSCONF_INSTALL_DIR:PATH=%_sysconfdir \\\ + -DSHARE_INSTALL_PREFIX:PATH=%_datadir \\\ + -DLIB_DESTINATION=%_lib \\\ + -DLIB_SUFFIX="%_libsuff" \\\ + -S . -B "%_cmake__builddir" + +# Notice: this macro affects _cmake__builddir, effectively preventing further +# out-of-source builds. Maintainers opting to build in-source are not +# interested in those, though. +%cmake_insource \ + %define _cmake__builddir . \ + %cmake + +%cmake_build %__cmake --build "%_cmake__builddir" --verbose --parallel %_smp_build_ncpus + +%cmake_install DESTDIR="%buildroot" %__cmake --install "%_cmake__builddir" --verbose + +# Deprecated macro; do not use in new packages. +# This macro only works with -G'Unix Makefiles', when cmake uses make(1). +%cmakeinstall_std \ + %makeinstall_std -C "%_cmake__builddir" + +%__ctest ctest +%ctest %__ctest --test-dir "%_cmake__builddir" --output-on-failure --force-new-ctest-process --parallel %_smp_build_ncpus + diff --git a/.gear/cmake.spec b/.gear/cmake.spec new file mode 100644 index 0000000000..57fc1312bf --- /dev/null +++ b/.gear/cmake.spec @@ -0,0 +1,723 @@ +%set_verify_elf_method unresolved=strict +%def_disable bootstrap +%if_disabled bootstrap +%def_enable gui +%def_enable docs +%def_disable jsoncpp_bootstrap +%endif +%def_without check +%add_optflags %optflags_shared +%define _cmake__builddir build + +Name: cmake +Version: 3.23.2 +Release: alt3 + +Summary: Cross-platform, open-source make system + +License: BSD +Group: Development/Tools +Url: http://cmake.org/ + +Packager: L.A. Kostis + +# Source-git: https://gitlab.kitware.com/cmake/cmake.git +Source: %name-%version.tar +Source1: %name.macros +Source2: CMakeCache.txt +Patch: %name-%version-%release.patch +Patch1: alt-fallback-modules-dir.patch +Patch2: 696d16ae6c5214e314cfc7cb809c2e574bcff651.patch + +%if_disabled bootstrap +BuildRequires(pre): rpm-macros-cmake +BuildRequires: cmake +%endif +BuildRequires(pre): rpm-build-xdg +BuildRequires: bzlib-devel gcc-c++ libarchive-devel >= 2.8.4 +BuildRequires: libcurl-devel libexpat-devel libncurses-devel libxml2-devel +BuildRequires: liblzma-devel jsoncpp-devel doxygen graphviz zlib-devel +BuildRequires: librhash-devel libuv-devel +BuildRequires: shared-mime-info rpm-build-vim + +%{?_enable_docs:BuildRequires: python3-module-sphinx-sphinx-build-symlink} +%{?_enable_gui:BuildRequires: qt5-base-devel} + +%{?!_without_check:%{?!_disable_check:BuildRequires: /proc gcc-fortran java-devel cvs subversion mercurial git-core}} + +Obsoletes: cpack < 2.4.5-alt3 +Provides: cpack = %version-%release + +Requires: %name-modules = %version-%release +Requires: rpm-macros-%name = %version-%release + +%define _unpackaged_files_terminate_build 1 + +%add_findreq_skiplist %_datadir/%name/Templates/cygwin-package.sh.in + + +%description +CMake is used to control the software compilation process using +simple platform and compiler independent configuration files. +CMake generates native makefiles and workspaces that can be +used in the compiler environment of your choice. CMake is quite +sophisticated: it is possible to support complex environments +requiring system configuration, pre-processor generation, code +generation, and template instantiation. + + +%package modules +Summary: Standard CMake modules +Group: Development/Tools +BuildArch: noarch + +%description modules +CMake is used to control the software compilation process using +simple platform and compiler independent configuration files. + +This package contains the standard modules from the CMake distribution. + + +%package -n ccmake +Summary: Curses interface for CMake +Group: Development/Tools +Requires: %name = %version-%release + +%description -n ccmake +The "ccmake" executable is the CMake curses interface. Project +configuration settings may be specified interactively through this GUI. +Brief instructions are provided at the bottom of the terminal when the +program is running. + + +%package -n ctest +Summary: CMake test driver program +Group: Development/Tools +Requires: %name = %version-%release + +%description -n ctest +The ctest executable is the CMake test driver program. CMake-generated +build trees created for projects that use the ENABLE_TESTING and +ADD_TEST commands have testing support. This program will run the tests +and report results. + + +%package gui +Summary: Qt interface for CMake +Group: Development/Tools +Requires: %name = %version-%release + +%description gui +The "cmake-gui" executable is the CMake GUI. Project configuration settings +may be specified interactively. Brief instructions are provided at the +bottom of the window when the program is running. + + +%package doc +Summary: CMake docs +Group: Documentation +BuildArch: noarch + +%description doc +This package contains CMake docs in DocBook, html and txt formats. + + +%package -n vim-plugin-%name +Summary: Vim plugins for CMake files +Group: Editors +BuildArch: noarch + +%description -n vim-plugin-%name +This package contains updated indent and syntax Vim plugins for CMake files. + +%package -n bash-completion-%name +Summary: bash completion for CMake +Group: Shells +BuildArch: noarch + +%description -n bash-completion-%name +bash completion for CMake + + +%package -n rpm-macros-%name +Summary: Set of RPM macros for packaging applications that use cmake +Group: Development/Other +Conflicts: cmake = 2.8.0-alt1 +Conflicts: rpm-build-compat <= 1.5.1-alt1 + +%description -n rpm-macros-%name +Set of RPM macros for packaging applications that use cmake. + + +%prep +%setup +%patch -p1 +%patch1 -p1 +%ifarch %e2k +# "Could NOT find OpenMP_C (missing: OpenMP_omp_LIBRARY OpenMP_pthread_LIBRARY)" +# cmake tries to scan the OpenMP example for libraries, which breaks the build +sed -i 's/if(CMAKE_${LANG}_VERBOSE_FLAG)/if(false) # &/' Modules/FindOpenMP.cmake +# -O3 is our recommended optlevel as of lcc 1.25 (see rpm-build) +sed -i 's/ -O2/ -O%_optlevel/g' Modules/Compiler/{LCC,GNU}* +%endif + +# remove bundled sources +rm -rf cmake/Utilities/{cmbzip2,cmbzip2,cmcurl,cmexpat,cmlibarchive,cmliblzma,cmlibrhash,cmlibuv,cmnghttp2,cmvssetup,cmzlib,cmzstd}/ +%if_disabled jsoncpp_bootstrap +rm -rf cmake/Utilities/cmjsoncpp/ +%endif + +%build +%if_enabled bootstrap +mkdir build +pushd build +install -m644 %SOURCE2 ./ + +CFLAGS="%optflags" CXXFLAGS="%optflags" ../bootstrap \ + --verbose \ + --parallel=%__nprocs \ + --system-libs \ +%if_enabled gui + --qt-gui \ +%endif +%if_enabled docs + --sphinx-man \ + --sphinx-html \ +%endif + --prefix=%prefix \ + --datadir=/share/%name \ + --mandir=/share/man \ + --docdir=/share/doc/%name-%version \ +%if_enabled jsoncpp_bootstrap + --no-system-jsoncpp \ +%endif + # + +export LD_LIBRARY_PATH=$PWD/Source:$PWD/Source/kwsys/:$PWD/Source/CursesDialog/form%{?_enable_jsoncpp_bootstrap::$PWD/Utilities/cmjsoncpp} +%make_build VERBOSE=1 +popd +%else +# without bootstrap +%cmake -DCMAKE_USE_SYSTEM_LIBRARIES=ON \ + -DCMAKE_DATA_DIR=share/%name \ + -DCMAKE_DOC_DIR=share/doc/%name-%version \ + -DCMAKE_MAN_DIR=share/man \ +%if_enabled gui + -DBUILD_QtDialog=ON \ +%endif +%if_enabled docs + -DSPHINX_HTML=ON -DSPHINX_MAN=ON \ +%endif + %nil +%cmake_build +%endif + +%install +pushd build +%if_enabled bootstrap +export LD_LIBRARY_PATH=$PWD/Source:$PWD/Source/kwsys/:$PWD/Source/CursesDialog/form%{?_enable_jsoncpp_bootstrap::$PWD/Utilities/cmjsoncpp} +%else +# FIXME +subst 's| bin/cmake| $(CMAKE_COMMAND)|' Makefile +%endif +%makeinstall_std +popd + +# TODO: fix in the sources +mv %buildroot/usr/lib %buildroot%_libdir || : + +%if_enabled jsoncpp_bootstrap +cp build/Utilities/cmjsoncpp/libcmjsoncpp.so %buildroot%_libdir/ +%endif + +%if_with gui +for i in 32 128; do + install -pD -m644 Source/QtDialog/CMakeSetup$i.png %buildroot%_iconsdir/hicolor/${i}x$i/apps/CMakeSetup.png +done +%endif + +mkdir -p %buildroot{%vim_indent_dir,%vim_syntax_dir,%_sysconfdir/bash_completion.d} +install -m644 Auxiliary/vim/indent/%name.vim %buildroot%vim_indent_dir/%name.vim +install -m644 Auxiliary/vim/syntax/%name.vim %buildroot%vim_syntax_dir/%name.vim +rm -rf %buildroot%_datadir/%name/editors/vim +install -pD -m644 %SOURCE1 %buildroot%_rpmmacrosdir/%name + +#mv -f %buildroot%_datadir/%name/completions %buildroot%_sysconfdir/bash_completion.d/%name +rm -vf %buildroot/usr/share/emacs/site-lisp/cmake-mode.el +# drop dump requires +rm -rfv %buildroot/%prefix/share/%name/Modules/Platform/AIX/ + +install -p build/Source/kwsys/libcmsys.so %buildroot%_libdir/libcmsys.so +install -p build/Source/kwsys/libcmsys_c.so %buildroot%_libdir/libcmsys_c.so + +%check +%if_with check +# CTest.UpdateGIT fails, see #20884 +unset GIT_DIR +unset GIT_INDEX_FILE +unset GIT_OBJECT_DIRECTORY +unset DISPLAY +pushd build +export LD_LIBRARY_PATH=%buildroot%_libdir +%make_build test ARGS="--output-on-failure -E 'CMake.FileDownload|CTestTestUpload'" +popd +%endif + +%files +%_bindir/cmake +%_bindir/cpack +%_libdir/libCMakeLib.so +%_libdir/libCPackLib.so +%_libdir/libcmsys.so +%_libdir/libcmsys_c.so +%_datadir/%name/ +%_aclocaldir/* +%if_enabled docs +%_man1dir/cmake*.* +%_man1dir/cpack.* +%_man7dir/* +%endif +%dir %_docdir/%name-%version/ +#_docdir/%name-%version/ChangeLog.manual +%_docdir/%name-%version/Copyright.txt +%_docdir/%name-%version/cmsys/ +%exclude %_datadir/%name/Modules/ +%if_enabled jsoncpp_bootstrap +%_libdir/libcmjsoncpp.so +%endif + +%files modules +%dir %_datadir/%name/ +%_datadir/%name/Modules/ + + +%files -n ccmake +%_bindir/ccmake +#_libdir/libcmForm.so +%if_enabled docs +%_man1dir/ccmake.* +%endif + + +%files -n ctest +%_bindir/ctest +%_libdir/libCTestLib.so +%if_enabled docs +%_man1dir/ctest.* +%endif + + +%if_enabled gui +%files gui +%_bindir/cmake-gui +%_desktopdir/cmake-gui.desktop +%_xdgmimedir/packages/cmakecache.xml +%_iconsdir/*/*/*/CMakeSetup.png +#_pixmapsdir/* +%endif + + +%if_enabled docs +%files doc +%dir %_docdir/%name-%version +#_docdir/%name-%version/ccmake.* +#_docdir/%name-%version/cmake* +#_docdir/%name-%version/cpack* +#_docdir/%name-%version/ctest.* +%_docdir/%name-%version/html +%endif + + +%files -n vim-plugin-%name +%vim_indent_dir/* +%vim_syntax_dir/* + +%files -n bash-completion-%name +#%_sysconfdir/bash_completion.d/* +%_datadir/bash-completion/completions/* + +%files -n rpm-macros-%name +%_rpmmacrosdir/* + +%filter_from_requires /^gnustep-Backbone.*/d + +%changelog +* Wed Apr 19 2023 Alexey Shabalin 3.23.2-alt3 +- add ctest macro (ALT#45833) + +* Wed Mar 29 2023 Michael Shigorin 3.23.2-alt2 +- cherry-picked upstream commit g28b1c5f to improve lcc 1.26 support on e2k + +* Fri Oct 21 2022 Michael Shigorin 3.23.2-alt1.2 +- E2K: default to -O%%_optlevel instead of hardwired -O2 + +* Sat Jul 30 2022 Ilya Kurdyukov 3.23.2-alt1.1 +- fixed failure of finding OpenMP on e2k + +* Tue Jun 07 2022 Vitaly Lipatov 3.23.2-alt1 +- new version + +* Wed Apr 13 2022 Vitaly Lipatov 3.23.1-alt1 +- new version + +* Mon Apr 04 2022 Vitaly Lipatov 3.23.0-alt1 +- new version + +* Mon Dec 13 2021 Vitaly Lipatov 3.22.2-alt1 +- new version + +* Fri Aug 27 2021 Vitaly Lipatov 3.21.2-alt1 +- new version +- fix BR for bootstrap case (thanks, @iv) + +* Thu Jul 29 2021 Vitaly Lipatov 3.21.1-alt1 +- new version + +* Sat Jul 24 2021 Vitaly Lipatov 3.21.0-alt3 +- fix build + +* Sat Jul 24 2021 Vitaly Lipatov 3.21.0-alt2 +- add bootstrap switch and build via cmake by default +- add optflags_shared to optflags + +* Fri Jul 23 2021 Vitaly Lipatov 3.21.0-alt1 +- new version 3.21.0 (with rpmrb script) + +* Tue Jul 06 2021 Vitaly Lipatov 3.20.5-alt1 +- new version 3.20.5 (with rpmrb script) + +* Fri Jun 04 2021 Arseny Maslennikov 3.19.7-alt4 +- macros: honor NPROCS in addition to %%__nprocs. (fixes ALT bug 40153) + +* Sat Apr 24 2021 Arseny Maslennikov 3.19.7-alt3 +- macros: add a macro to allow cmake command name substitution +- macros: allow easy override of build artifact directory + +* Fri Apr 23 2021 Vitaly Lipatov 3.19.7-alt2 +- drop requires dump from cmake-modules +- build without bundled sources +- use python3-module-sphinx-sphinx-build-symlink instead of python-module-sphinx-devel + +* Tue Mar 16 2021 Vitaly Lipatov 3.19.7-alt1 +- new version 3.19.7 (with rpmrb script) + +* Thu Feb 25 2021 Vitaly Lipatov 3.19.6-alt1 +- new version 3.19.6 (with rpmrb script) + +* Thu Jan 28 2021 Vitaly Lipatov 3.19.4-alt1 +- new version 3.19.4 (with rpmrb script) + +* Thu Jan 21 2021 Vitaly Lipatov 3.19.3-alt1 +- new version 3.19.3 (with rpmrb script) + +* Tue Dec 01 2020 Vitaly Lipatov 3.19.1-alt1 +- new version 3.19.1 (with rpmrb script) + +* Wed Nov 18 2020 Vitaly Lipatov 3.18.5-alt1 +- new version 3.18.5 (with rpmrb script) + +* Tue Oct 06 2020 Vitaly Lipatov 3.18.4-alt1 +- new version 3.18.4 (with rpmrb script) +- drop FindJNI.cmake patch (applied in upstream 3.18.4) + +* Sat Sep 26 2020 Vitaly Lipatov 3.18.3-alt2 +- add aarch64 dir support in FindJNI.cmake (ALT bug 38992) + +* Tue Sep 22 2020 Vitaly Lipatov 3.18.3-alt1 +- new version 3.18.3 (with rpmrb script) + +* Fri Aug 21 2020 Vitaly Lipatov 3.18.2-alt1 +- new version 3.18.2 (with rpmrb script) + +* Thu Jul 30 2020 Vitaly Lipatov 3.18.1-alt1 +- new version 3.18.1 (with rpmrb script) + +* Wed Jul 15 2020 Vitaly Lipatov 3.18.0-alt1 +- new version 3.18.0 (with rpmrb script) + +* Fri May 29 2020 Vitaly Lipatov 3.17.3-alt1 +- new version 3.17.3 (with rpmrb script) + +* Fri May 29 2020 Vitaly Lipatov 3.17.2-alt1 +- new version 3.17.2 (with rpmrb script) + +* Sat Mar 21 2020 Vitaly Lipatov 3.17.0-alt1 +- new version 3.17.0 (with rpmrb script) + +* Thu Feb 06 2020 Vitaly Lipatov 3.16.4-alt1 +- new version 3.16.4 (with rpmrb script) + +* Wed Jan 29 2020 Vitaly Lipatov 3.16.3-alt2 +- fix LIBDIR set in GNUInstallDirs + +* Fri Jan 24 2020 Vitaly Lipatov 3.16.3-alt1 +- new version 3.16.3 (with rpmrb script) + +* Sun Oct 20 2019 Vitaly Lipatov 3.15.4-alt1 +- new version 3.15.4 (with rpmrb script) + +* Wed May 15 2019 Dmitry V. Levin 3.13.4-alt3 +- NMU. +- macros: fixed bug in definitions of %%cmake and %%cmake_insource + introduced in the previous release. + +* Sat May 11 2019 Gleb F-Malinovskiy 3.13.4-alt2 +- macros: use %%_libsuff macro. +- spec: add knobs useful for bootstrap. + +* Wed Feb 06 2019 Vitaly Lipatov 3.13.4-alt1 +- new version 3.13.4 (with rpmrb script) +- treat "No source or binary directory provided" as warning (ALT bug 36051) + +* Tue Feb 05 2019 Vitaly Lipatov 3.13.3-alt1 +- new version 3.13.3 (with rpmrb script) (ALT bug 36041) + +* Wed Dec 05 2018 Vitaly Lipatov 3.13.1-alt1 +- Updated to upstream version 3.13.1 (ALT bug 35702) + +* Thu Jul 19 2018 Grigory Ustinov 3.11.2-alt2 +- Fixed FTBS (Add missing rpm-build-xdg). + +* Thu May 31 2018 Aleksei Nikiforov 3.11.2-alt1 +- Updated to upstream version 3.11.2. + +* Wed Feb 28 2018 Alexey Shabalin 3.10.2-alt1 +- 3.10.2 +- backport support boost-1.66 from cmake-3.11.0-rc2 + +* Tue Oct 31 2017 Vitaly Lipatov 3.9.2-alt1 +- autogen: Don't use AUTOMOC_MOC_OPTIONS in moc-predefs command (ALT bug 34055) + +* Mon Oct 23 2017 Sergey V Turchin 3.9.2-alt0.4 +- search old sharedir CMake directory too + +* Thu Oct 19 2017 Igor Vlasenko 3.9.2-alt0.3 +- NMU: set cmake sharedir to %%_datadir/ cmake, not CMake + +* Wed Sep 13 2017 Alexey Shabalin 3.9.2-alt0.2 +- Set optimization for RELEASE to ALTLinux default. +- FindBoost: Add version 1.65.1 (thx Roger Leigh). +- FindBoost: Add Boost 1.65 dependencies (thx Roger Leigh). +- FindBoost: Add option to prevent finding DEBUG/RELEASE Boost-libs (thx Deniz Bahadir). + +* Tue Sep 12 2017 L.A. Kostis 3.9.2-alt0.1 +- 3.9.2: + + enable server mode by default. + + update buildreq (added librhash and libuv). + +* Fri Jan 20 2017 Gleb F-Malinovskiy 3.6.3-alt0.2 +- FindBoost.cmake: added support of boost 1.62 and 1.63. + +* Tue Dec 13 2016 L.A. Kostis 3.6.3-alt0.1 +- Updated to 3.6.3. +- .spec cleanup for new rpm. + +* Sun Oct 23 2016 L.A. Kostis 3.6.2-alt0.2 +- Added some patches from debian: + - FindBoost_add_-lpthread_#563479.diff: Add -lpthread when using Boost::Thread. + - qt_import_dir_variable.diff: FindQt4: define QT_IMPORTS_DIR variable + even if it is not present on the system. + +* Sat Oct 22 2016 L.A. Kostis 3.6.2-alt0.1 +- test build of 3.6.2. + +* Mon Jun 13 2016 L.A. Kostis 3.4.3-alt0.1 +- test build of 3.4.3. + +* Wed Sep 02 2015 Sergey V Turchin 3.2.2-alt3.1 +- remove variable dereference from FindPkgConfig + +* Thu Jun 4 2015 Anton V. Boyarshinov 3.2.2-alt3 +- rebuild with c++11 ABI + +* Tue Apr 28 2015 Eugeny A. Rostovtsev (REAL) 3.2.2-alt2 +- Avoid requirement on gnustep-Backbone (ALT #30978) + +* Sat Apr 25 2015 Eugeny A. Rostovtsev (REAL) 3.2.2-alt1 +- Version 3.2.2 (ALT #30677) + +* Tue Nov 12 2013 Slava Dubrovskiy 2.8.12.1-alt2 +- Revert changes in cmake.macros and add new macros %%_cmake_skip_rpath -DCMAKE_SKIP_RPATH:BOOL=ON + +* Thu Nov 07 2013 Slava Dubrovskiy 2.8.12.1-alt1 +- 2.8.12.1 +- Added additional macros in cmake.macros (ALT#27879) +- Change in cmake.macros CMAKE_SKIP_RPATH to CMAKE_SKIP_INSTALL_RPATH + look the discussion http://public.kitware.com/pipermail/cmake-developers/2012-February/003254.html + +* Thu May 23 2013 Slava Dubrovskiy 2.8.11-alt1 +- 2.8.11 + +* Tue Mar 26 2013 Slava Dubrovskiy 2.8.10.2-alt1 +- 2.8.10.2 + +* Tue Nov 20 2012 Slava Dubrovskiy 2.8.10.1-alt1 +- 2.8.10.1 + +* Sat Oct 06 2012 Dmitry V. Levin 2.8.9-alt1.2 +- Reverted previous change, it was a no longer needed workaround + for make-3.82-alt4 quotation bug. + +* Wed Sep 26 2012 Eugeny A. Rostovtsev (REAL) 2.8.9-alt1.1 +- Avoid tests with spaces in names of files and directories + +* Sat Sep 01 2012 Slava Dubrovskiy 2.8.9-alt1 +- 2.8.9 +- Add subpackage bash-completion-cmake + +* Wed Jun 27 2012 Slava Dubrovskiy 2.8.8-alt3 +- Really fix FindPkgConfig.cmake regression (closes: #27499) + +* Mon Jun 25 2012 Slava Dubrovskiy 2.8.8-alt2 +- Fix FindPkgConfig.cmake regression (closes: #27499) + +* Sat Jun 23 2012 Slava Dubrovskiy 2.8.8-alt1 +- 2.8.8 +- add %%cmake_build, %%cmake_install and %%cmakeinstall_std macros (closes: #24229) + +* Tue Jan 24 2012 Slava Dubrovskiy 2.8.7-alt1 +- 2.8.7 + +* Sat Oct 08 2011 Slava Dubrovskiy 2.8.6-alt1 +- 2.8.6 + +* Sat Jul 16 2011 Slava Dubrovskiy 2.8.5-alt1 +- 2.8.5 +- Disable test CTestTestUpload + +* Sun Mar 20 2011 Slava Dubrovskiy 2.8.4-alt1 +- 2.8.4 +- Update spec: add necessary LD_LIBRARY_PATH for build process (thanks real@) +- Remove build type and add flags for Fortran (thanks real@) + +* Sat Jan 22 2011 Slava Dubrovskiy 2.8.3-alt1 +- 2.8.3 + +* Tue Jul 13 2010 Andrey Rahmatullin 2.8.2-alt1 +- 2.8.2 +- add/restore VCS tests by adding the necessary buildreqs +- add an additional #20884 workaround needed for new gear --commit + +* Tue May 11 2010 Andrey Rahmatullin 2.8.1-alt3 +- fix %%cmake_insource (sin@, closes: #23459) + +* Mon Mar 29 2010 Dmitry V. Levin 2.8.1-alt2 +- Fixed and reenabled %%check. + +* Sun Mar 28 2010 Andrey Rahmatullin 2.8.1-alt1 +- 2.8.1 +- disable tests (CTestTestTimeout fails in hasher) + +* Tue Nov 24 2009 Andrey Rahmatullin 2.8.0-alt2 +- move macros to the separate package according to the policy + +* Mon Nov 16 2009 Andrey Rahmatullin 2.8.0-alt1 +- 2.8.0 +- add %%cmake and %%cmake_insource macros (closes: #22209) + +* Sat Jul 25 2009 Andrey Rahmatullin 2.6.4-alt2 +- add workarounds for buffer overflows + +* Mon May 04 2009 Andrey Rahmatullin 2.6.4-alt1 +- 2.6.4 + +* Fri Mar 13 2009 Andrey Rahmatullin 2.6.3-alt2 +- package Vim plugins (closes: #19158) + +* Fri Mar 06 2009 Andrey Rahmatullin 2.6.3-alt1 +- 2.6.3 +- fix Group: +- cmake-doc: don't require cmake + +* Thu Dec 11 2008 Andrey Rahmatullin 2.6.2-alt3 +- package docdir into the main package (repocop) + +* Mon Nov 17 2008 Andrey Rahmatullin 2.6.2-alt2 +- remove update_*/clean_* invocations + +* Sat Sep 27 2008 Andrey Rahmatullin 2.6.2-alt1 +- 2.6.2 + +* Sun Aug 03 2008 Andrey Rahmatullin 2.6.1-alt1 +- 2.6.1 +- fix .desktop file according to desktop-file-validate +- move CMakeSetup.png from _pixmapsdir to _niconsdir +- make -doc subpackage noarch and split noarch -modules subpackage + +* Sun May 11 2008 Andrey Rahmatullin 2.6.0-alt1 +- 2.6.0 +- package html and txt docs separately + +* Sat Feb 09 2008 Andrey Rahmatullin 2.4.8-alt1 +- 2.4.8 + +* Mon Jul 23 2007 Andrey Rahmatullin 2.4.7-alt1 +- 2.4.7 + +* Fri Mar 30 2007 Andrey Rahmatullin 2.4.6-alt2 +- rebuild with libcurl.so.4 + +* Sat Jan 13 2007 Andrey Rahmatullin 2.4.6-alt1 +- 2.4.6 + +* Wed Jan 03 2007 Andrey Rahmatullin 2.4.5-alt4 +- build in separate dir +- use optflags + +* Wed Jan 03 2007 Andrey Rahmatullin 2.4.5-alt3 +- merge cpack package into cmake, since it is required by (almost?) + all cmake builds (#10577) + +* Sun Dec 17 2006 Andrey Rahmatullin 2.4.5-alt2 +- remove globbing of /usr/lib/qt-3* from FindQt3.cmake, which caused + incorrect buildreq output for projects using FIND_PACKAGE(Qt3) + +* Sat Dec 09 2006 Andrey Rahmatullin 2.4.5-alt1 +- 2.4.5 +- fix x86_64 build (damir@) + +* Sun Dec 03 2006 Andrey Rahmatullin 2.4.5-alt0.2 +- separate packages for ccmake, cpack and ctest + +* Sat Dec 02 2006 Andrey Rahmatullin 2.4.5-alt0.1 +- 2.4.5 RC4 +- fix search for libxmlrpc + +* Thu Nov 23 2006 Andrey Rahmatullin 2.4.4-alt1 +- 2.4.4 + +* Wed Aug 23 2006 Andrey Rahmatullin 2.4.3-alt2 +- build with system libs +- build bundled libs as shared +- invoke make test + +* Thu Aug 03 2006 Andrey Rahmatullin 2.4.3-alt1 +- new version + +* Thu Jul 13 2006 Vitaly Lipatov 2.4.2-alt0.1 +- new version 2.4.2 (with rpmrb script) (fix bug #9776) + +* Tue May 09 2006 Vitaly Lipatov 2.4.1-alt0.1 +- new version (2.4.1) + +* Wed Jan 25 2006 Vitaly Lipatov 2.2.3-alt0.1 +- new version +- fix rpath using + +* Tue Oct 04 2005 Vitaly Lipatov 2.2.1-alt1 +- new version + +* Sun Feb 27 2005 Vitaly Lipatov 2.0.5-alt1 +- first release for ALT Linux Sisyphus + +* Tue Nov 23 2004 Gaetan LEHMANN 2.0.5-1mdk +- 2.0.5 + +* Tue Jun 15 2004 Laurent MONTEL 1.6.7-2mdk +- Rebuild + +* Thu Jul 17 2003 Austin Acton 1.6.7-1mdk +- 1.6.7 + +* Thu Jan 9 2003 Austin Acton 1.4.7-1mdk +- initial package diff --git a/.gear/rules b/.gear/rules new file mode 100644 index 0000000000..40914946be --- /dev/null +++ b/.gear/rules @@ -0,0 +1,6 @@ +spec: .gear/cmake.spec +tar: v@version@:. +diff: v@version@:. . +copy: .gear/*.macros +copy: .gear/*.txt +copy?: .gear/*.patch diff --git a/.gear/tags/a124950a02fcc6497c807aac670c70e63b86e3cf b/.gear/tags/a124950a02fcc6497c807aac670c70e63b86e3cf new file mode 100644 index 0000000000..4f8d0d7288 --- /dev/null +++ b/.gear/tags/a124950a02fcc6497c807aac670c70e63b86e3cf @@ -0,0 +1,23 @@ +object a8bd06dfd47a56e09e660de5e58f26579105d2d4 +type commit +tag v3.23.2 +tagger Brad King 1653500052 -0400 + +CMake 3.23.2 +-----BEGIN PGP SIGNATURE----- + +iQJKBAABCgA0FiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAmKOaJQWHGJyYWQua2lu +Z0BraXR3YXJlLmNvbQAKCRAtLO8QNJIWhJQHD/9yx3rDC91G5P0CAqZ3R1niewXs +oKWTW706XmZomagUuyFVrYlsfcxTMbZ1rsOg1+UMsQlSa/XgExGuFb2VCP204t/S +RbKgAP4Kzb37uAlhkBYSRzGg2BB3yRROY33RZxIwn494VqLWueIqYeRn8bhBshLU +ArIiJ6ukGnYxu5vCJqvGYfLpkKOssrNTh91VQLJmU1HLH9kJT2mQLNmVw6Ce2+9v +w4czb2qd47cQoTN+mE72Kp7EQXW7zEQzdIYnw68nb/rgsvEkMaGuhgS23bKRabwY +30dg/mNm8c4dALoSXLUIgJ/fh7WgHZf9XQYTzgAKDmZ8qtY7N+vyHyto6PqGlTyz +1ROK+wYzzHrn1oxlOH/IHOdqtrJKDvByfCP/NfGzz6THMFPviV+mgBDV0esG2dqN +x3wsbG8PXn5ZUBEt28KV4sbv5j3yaMESQTq9dYVnKMI4+uWUA94XJnc61gXFElqH +eX/xUzwgiB4zD/AyUDMyt/Tkalq8lHFu8X8W36Ahj8eJZ3AWSFXkYvXVS6sHyaqo +Aeq5DkVUsMzuTRPItZL5H9X2JiaNL00lYypv0bwrcB3jH5dhNYxNQhFb4xjrzHlc +2wicUzQeS2EQUT2f+Udxi01TWnfln/oho8ngxZVtAD2hT+Y+IEzpF5kvrdmqO/Y4 +WsGXsFe2W1gVPNOs0w== +=tFqm +-----END PGP SIGNATURE----- diff --git a/.gear/tags/list b/.gear/tags/list new file mode 100644 index 0000000000..fe93fa1e56 --- /dev/null +++ b/.gear/tags/list @@ -0,0 +1 @@ +a124950a02fcc6497c807aac670c70e63b86e3cf v3.23.2 diff --git a/CMakeLists.txt b/CMakeLists.txt index b2ab30e152..cc50772bb7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -742,7 +742,7 @@ set_directory_properties(PROPERTIES if(NOT CMake_TEST_EXTERNAL_CMAKE) # where to write the resulting executables and libraries - set(BUILD_SHARED_LIBS OFF) + set(BUILD_SHARED_LIBS ON) set(EXECUTABLE_OUTPUT_PATH "" CACHE INTERNAL "No configurable exe dir.") set(LIBRARY_OUTPUT_PATH "" CACHE INTERNAL "Where to put the libraries for CMake") diff --git a/CompileFlags.cmake b/CompileFlags.cmake index e6fb20b500..5641de4119 100644 --- a/CompileFlags.cmake +++ b/CompileFlags.cmake @@ -136,3 +136,12 @@ OFF to disable /MP completely." ) endif() endif() endif() + +# Get rid of excess -Wunused-but-set-variable on release builds with LCC >= 1.26 +foreach(l C CXX) + if(CMAKE_${l}_COMPILER_ID STREQUAL "LCC" AND NOT CMAKE_${l}_COMPILER_VERSION VERSION_LESS 1.26) + foreach(c MINSIZEREL RELEASE RELWITHDEBINFO) + string(APPEND "CMAKE_${l}_FLAGS_${c}" " -Wno-unused-but-set-variable") + endforeach() + endif() +endforeach() diff --git a/Modules/Compiler/Absoft-Fortran.cmake b/Modules/Compiler/Absoft-Fortran.cmake index 8724f854a3..81cb849baf 100644 --- a/Modules/Compiler/Absoft-Fortran.cmake +++ b/Modules/Compiler/Absoft-Fortran.cmake @@ -1,7 +1,7 @@ string(APPEND CMAKE_Fortran_FLAGS_INIT " ") string(APPEND CMAKE_Fortran_FLAGS_DEBUG_INIT " -g") string(APPEND CMAKE_Fortran_FLAGS_MINSIZEREL_INIT " ") -string(APPEND CMAKE_Fortran_FLAGS_RELEASE_INIT " -O3") +string(APPEND CMAKE_Fortran_FLAGS_RELEASE_INIT " -O2") string(APPEND CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT " -O2 -g") set(CMAKE_Fortran_MODDIR_FLAG "-YMOD_OUT_DIR=") set(CMAKE_Fortran_MODPATH_FLAG "-p") diff --git a/Modules/Compiler/G95-Fortran.cmake b/Modules/Compiler/G95-Fortran.cmake index 5dba04efb6..8b1deff9cb 100644 --- a/Modules/Compiler/G95-Fortran.cmake +++ b/Modules/Compiler/G95-Fortran.cmake @@ -1,7 +1,7 @@ string(APPEND CMAKE_Fortran_FLAGS_INIT " ") string(APPEND CMAKE_Fortran_FLAGS_DEBUG_INIT " -g") string(APPEND CMAKE_Fortran_FLAGS_MINSIZEREL_INIT " -Os") -string(APPEND CMAKE_Fortran_FLAGS_RELEASE_INIT " -O3") +string(APPEND CMAKE_Fortran_FLAGS_RELEASE_INIT " -O2") string(APPEND CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT " -O2 -g") set(CMAKE_Fortran_MODDIR_FLAG "-fmod=") set(CMAKE_Fortran_VERBOSE_FLAG "-v") diff --git a/Modules/Compiler/GNU-Fortran.cmake b/Modules/Compiler/GNU-Fortran.cmake index 5dfb03e2eb..f20da063d0 100644 --- a/Modules/Compiler/GNU-Fortran.cmake +++ b/Modules/Compiler/GNU-Fortran.cmake @@ -19,7 +19,7 @@ set(CMAKE_Fortran_POSTPROCESS_FLAG "-fpreprocessed") # No -DNDEBUG for Fortran. string(APPEND CMAKE_Fortran_FLAGS_MINSIZEREL_INIT " -Os") -string(APPEND CMAKE_Fortran_FLAGS_RELEASE_INIT " -O3") +string(APPEND CMAKE_Fortran_FLAGS_RELEASE_INIT " -O2") # No -isystem for Fortran because it will not find .mod files. unset(CMAKE_INCLUDE_SYSTEM_FLAG_Fortran) diff --git a/Modules/Compiler/GNU.cmake b/Modules/Compiler/GNU.cmake index 928e7263fc..450ae967f1 100644 --- a/Modules/Compiler/GNU.cmake +++ b/Modules/Compiler/GNU.cmake @@ -55,7 +55,7 @@ macro(__compiler_gnu lang) string(APPEND CMAKE_${lang}_FLAGS_INIT " ") string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g") string(APPEND CMAKE_${lang}_FLAGS_MINSIZEREL_INIT " -Os -DNDEBUG") - string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O3 -DNDEBUG") + string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O2 -DNDEBUG") string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -g -DNDEBUG") set(CMAKE_${lang}_CREATE_PREPROCESSED_SOURCE " -E > ") set(CMAKE_${lang}_CREATE_ASSEMBLY_SOURCE " -S -o ") diff --git a/Modules/Compiler/Intel.cmake b/Modules/Compiler/Intel.cmake index 9a760c8f54..35d0bf49d5 100644 --- a/Modules/Compiler/Intel.cmake +++ b/Modules/Compiler/Intel.cmake @@ -22,7 +22,7 @@ else() string(APPEND CMAKE_${lang}_FLAGS_INIT " ") string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g") string(APPEND CMAKE_${lang}_FLAGS_MINSIZEREL_INIT " -Os") - string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O3") + string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O2") string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -g") set(CMAKE_${lang}_COMPILER_PREDEFINES_COMMAND "${CMAKE_${lang}_COMPILER}") diff --git a/Modules/Compiler/NVIDIA-CUDA.cmake b/Modules/Compiler/NVIDIA-CUDA.cmake index 2f12b4378b..b42af18b21 100644 --- a/Modules/Compiler/NVIDIA-CUDA.cmake +++ b/Modules/Compiler/NVIDIA-CUDA.cmake @@ -52,7 +52,7 @@ if(NOT "x${CMAKE_CUDA_SIMULATE_ID}" STREQUAL "xMSVC") set(CMAKE_SHARED_LIBRARY_CUDA_FLAGS -fPIC) string(APPEND CMAKE_CUDA_FLAGS_INIT " ") string(APPEND CMAKE_CUDA_FLAGS_DEBUG_INIT " -g") - string(APPEND CMAKE_CUDA_FLAGS_RELEASE_INIT " -O3 -DNDEBUG") + string(APPEND CMAKE_CUDA_FLAGS_RELEASE_INIT " -O2 -DNDEBUG") string(APPEND CMAKE_CUDA_FLAGS_MINSIZEREL_INIT " -O1 -DNDEBUG") string(APPEND CMAKE_CUDA_FLAGS_RELWITHDEBINFO_INIT " -O2 -g -DNDEBUG") endif() diff --git a/Modules/Compiler/PGI.cmake b/Modules/Compiler/PGI.cmake index d111be9ab6..934c94c0b7 100644 --- a/Modules/Compiler/PGI.cmake +++ b/Modules/Compiler/PGI.cmake @@ -18,7 +18,7 @@ macro(__compiler_pgi lang) string(APPEND CMAKE_${lang}_FLAGS_INIT " ") string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g -O0") string(APPEND CMAKE_${lang}_FLAGS_MINSIZEREL_INIT " -O2 -s") - string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -fast -O3") + string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -fast -O2") string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -gopt") if(CMAKE_HOST_WIN32) diff --git a/Modules/Compiler/PathScale.cmake b/Modules/Compiler/PathScale.cmake index d5f8cb12b8..dd9bf1b929 100644 --- a/Modules/Compiler/PathScale.cmake +++ b/Modules/Compiler/PathScale.cmake @@ -16,6 +16,6 @@ macro(__compiler_pathscale lang) string(APPEND CMAKE_${lang}_FLAGS_INIT " ") string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g -O0") string(APPEND CMAKE_${lang}_FLAGS_MINSIZEREL_INIT " -Os") - string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O3") + string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O2") string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -g -O2") endmacro() diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index ddcdd7e90e..68543b14ac 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -1214,6 +1214,17 @@ endif() # Install tools +set(_tools cmake ctest cpack) + +if(APPLE) + list(APPEND _tools cmakexbuild) +endif() +if(BUILD_SHARED_LIBS) + install_targets(/lib CMakeLib) + install_targets(/lib CPackLib) + install_targets(/lib CTestLib) +endif() + foreach(_tool ${_tools}) CMake_OPTIONAL_COMPONENT(${_tool}) install(TARGETS ${_tool} DESTINATION ${CMAKE_BIN_DIR} ${COMPONENT}) diff --git a/Source/CursesDialog/form/CMakeLists.txt b/Source/CursesDialog/form/CMakeLists.txt index 68d28c8397..bc8cb17b58 100644 --- a/Source/CursesDialog/form/CMakeLists.txt +++ b/Source/CursesDialog/form/CMakeLists.txt @@ -67,3 +67,6 @@ target_link_libraries(cmForm ${CURSES_LIBRARY}) if(CURSES_EXTRA_LIBRARY) target_link_libraries(cmForm ${CURSES_EXTRA_LIBRARY}) endif() +if(BUILD_SHARED_LIBS) + INSTALL_TARGETS(/lib cmForm) +endif() diff --git a/Source/QtDialog/cmake-gui.desktop b/Source/QtDialog/cmake-gui.desktop index 842091f5b7..aa862a43a3 100644 --- a/Source/QtDialog/cmake-gui.desktop +++ b/Source/QtDialog/cmake-gui.desktop @@ -7,6 +7,6 @@ Icon=CMakeSetup Terminal=false X-MultipleArgs=false Type=Application -Categories=Development; +Categories=Development;Building;Qt; StartupNotify=true MimeType=application/x-cmakecache; diff --git a/Utilities/cmzlib/CMakeLists.txt b/Utilities/cmzlib/CMakeLists.txt index 42bf2c5b16..7a43575815 100644 --- a/Utilities/cmzlib/CMakeLists.txt +++ b/Utilities/cmzlib/CMakeLists.txt @@ -42,3 +42,6 @@ CONFIGURE_FILE(${CMZLIB_SOURCE_DIR}/zlibDllConfig.h.in ADD_LIBRARY(cmzlib ${ZLIB_SRCS}) INSTALL(FILES Copyright.txt DESTINATION ${CMAKE_DOC_DIR}/cmzlib) +IF(BUILD_SHARED_LIBS) + INSTALL_TARGETS(/lib cmzlib) +ENDIF(BUILD_SHARED_LIBS)