Mercurial > mxe-octave

changeset 6891:5451bbbaf0d3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: Allow CMake to look for packages installed on build host. * Makefile.in (build-cmake-toolchain-file): For native builds, allow cmake to find packages installed in /usr on the build host.
author Markus Mützel <markus.muetzel@gmx.de>
date Sun, 01 Oct 2023 14:37:57 +0200
parents f744a377c634
children fe46a604d08b
files Makefile.in
diffstat 1 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.in	Sun Oct 01 12:33:28 2023 +0200
+++ b/Makefile.in	Sun Oct 01 14:37:57 2023 +0200
@@ -1146,12 +1146,17 @@
        echo 'set(MSVC 1)'; \
      fi; \
      echo 'set(CMAKE_BUILD_TYPE Release)'; \
-     if [ $(MXE_SYSTEM) = msvc ]; then \
+     if [ "$(MXE_NATIVE_BUILD)" = yes ]; then \
+       echo 'set(CMAKE_FIND_ROOT_PATH $(HOST_PREFIX);/usr)'; \
+       echo 'set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)'; \
+     else \
+       if [ $(MXE_SYSTEM) = msvc ]; then \
          echo 'set(CMAKE_FIND_ROOT_PATH $(HOST_PREFIX_NATIVE))'; \
          echo 'set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)'; \
-     else \
+       else \
          echo 'set(CMAKE_FIND_ROOT_PATH $(HOST_PREFIX))'; \
          echo 'set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)'; \
+       fi; \
      fi; \
      echo 'set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)'; \
      echo 'set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)'; \