Mercurial > mxe-octave

changeset 6905:0d1843620df0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: Install libraries to "lib" by default for CMake build rules. * Makefile.in (build-cmake-toolchain-file, build-native-cmake-toolchain-file): Set CMAKE_INSTALL_LIBDIR to "lib" in CMake policy files.
author Markus Mützel <markus.muetzel@gmx.de>
date Wed, 04 Oct 2023 17:15:07 +0200
parents 67989b9b99b1
children bd03a2848e1d
files Makefile.in
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.in	Tue Oct 03 16:57:29 2023 -0400
+++ b/Makefile.in	Wed Oct 04 17:15:07 2023 +0200
@@ -1178,6 +1178,7 @@
      else \
          echo 'set(CMAKE_INSTALL_PREFIX $(HOST_PREFIX) CACHE PATH "Installation Prefix")'; \
      fi; \
+     echo 'set(CMAKE_INSTALL_LIBDIR "lib")'; \
      echo 'set(CMAKE_BUILD_TYPE Release CACHE STRING "Debug|Release|RelWithDebInfo|MinSizeRel")') \
      > '$(CMAKE_TOOLCHAIN_FILE)'
 endef
@@ -1195,6 +1196,8 @@
      echo 'set(CMAKE_CXX_COMPILER $(CXX))'; \
      echo 'set(CMAKE_Fortran_COMPILER $(F77))'; \
      echo 'set(CMAKE_RC_COMPILER $(WINDRES))'; \
+     echo 'set(CMAKE_INSTALL_PREFIX $(HOST_PREFIX_NATIVE) CACHE PATH "Installation Prefix")'; \
+     echo 'set(CMAKE_INSTALL_LIBDIR "lib")'; \
      echo 'set(CMAKE_BUILD_TYPE Release CACHE STRING "Debug|Release|RelWithDebInfo|MinSizeRel")') \
     > '$(CMAKE_NATIVE_TOOLCHAIN_FILE)'
 endef