diff options
| author | Yaakov Selkowitz <yselkowi@redhat.com> | 2015-06-10 21:42:08 -0500 |
|---|---|---|
| committer | Yaakov Selkowitz <yselkowi@redhat.com> | 2015-06-10 22:02:06 -0500 |
| commit | b2f0da6d9048b91be54e487d080db051c2f15175 (patch) | |
| tree | b30431291119bd4883d007de8a865b839bdfef1b | |
| parent | e979c27cc7ee25671d41b74a8f984c6193601526 (diff) | |
| download | cygwin-filesystem-b2f0da6d9048b91be54e487d080db051c2f15175.tar.gz cygwin-filesystem-b2f0da6d9048b91be54e487d080db051c2f15175.tar.xz cygwin-filesystem-b2f0da6d9048b91be54e487d080db051c2f15175.zip | |
Don't set LIB_INSTALL_DIR any more in the CMake macros as it breaks CPack
Based on mingw-filesystem commit 2031da5ebbd4b03e5bbdc4c83dc337a651e90e14.
| -rw-r--r-- | cygwin-filesystem.spec | 1 | ||||
| -rw-r--r-- | macros.cygwin32 | 1 | ||||
| -rw-r--r-- | macros.cygwin64 | 1 |
3 files changed, 1 insertions, 2 deletions
diff --git a/cygwin-filesystem.spec b/cygwin-filesystem.spec index e826334..63a793b 100644 --- a/cygwin-filesystem.spec +++ b/cygwin-filesystem.spec @@ -252,6 +252,7 @@ install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/cygwin/ - Allow verbose CMake output to be disabled - Don't use verbose output by default in the CMake wrapper scripts - Prevent CFLAGS and CXXFLAGS from being set when using CMake wrappers +- Don't set LIB_INSTALL_DIR any more in the CMake macros as it breaks CPack * Thu Jun 11 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 12-1 - Add cppflags, ldflags variables diff --git a/macros.cygwin32 b/macros.cygwin32 index d3b613f..edb4188 100644 --- a/macros.cygwin32 +++ b/macros.cygwin32 @@ -167,7 +167,6 @@ package or when debugging this package. \ -DCMAKE_INSTALL_PREFIX:PATH=%{cygwin32_prefix} \\\ -DCMAKE_INSTALL_LIBDIR:PATH=%{cygwin32_libdir} \\\ -DINCLUDE_INSTALL_DIR:PATH=%{cygwin32_includedir} \\\ - -DLIB_INSTALL_DIR:PATH=%{cygwin32_libdir} \\\ -DSYSCONF_INSTALL_DIR:PATH=%{cygwin32_sysconfdir} \\\ -DSHARE_INSTALL_PREFIX:PATH=%{cygwin32_datadir} \\\ %{?_cmake_skip_rpath} \\\ diff --git a/macros.cygwin64 b/macros.cygwin64 index afffe09..4b51f8e 100644 --- a/macros.cygwin64 +++ b/macros.cygwin64 @@ -185,7 +185,6 @@ package or when debugging this package. \ -DCMAKE_INSTALL_PREFIX:PATH=%{cygwin64_prefix} \\\ -DCMAKE_INSTALL_LIBDIR:PATH=%{cygwin64_libdir} \\\ -DINCLUDE_INSTALL_DIR:PATH=%{cygwin64_includedir} \\\ - -DLIB_INSTALL_DIR:PATH=%{cygwin64_libdir} \\\ -DSYSCONF_INSTALL_DIR:PATH=%{cygwin64_sysconfdir} \\\ -DSHARE_INSTALL_PREFIX:PATH=%{cygwin64_datadir} \\\ %{?_cmake_skip_rpath} \\\ |