[vlc-commits] [Git][videolan/vlc][master] contrib: set cmake PATH_MODE_PACKAGE="only" when cross-compiling

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
72108fc8 by Fatih Uzunoglu at 2024-01-16T07:16:22+00:00
contrib: set cmake PATH_MODE_PACKAGE="only" when cross-compiling

This seems to be mistakenly not included. Usually; library,
include, and package path mode should all be set to "only"
when cross-compiling.

- - - - -


2 changed files:

- contrib/src/gen-cmake-toolchain.py
- contrib/src/main.mak


Changes:

=====================================
contrib/src/gen-cmake-toolchain.py
=====================================
@@ -53,6 +53,7 @@ _add_environ_val('CMAKE_FIND_ROOT_PATH', 'FIND_ROOT_PATH')
 args.file.write("set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)\n")
 _add_environ_val('CMAKE_FIND_ROOT_PATH_MODE_LIBRARY', 'PATH_MODE_LIBRARY')
 _add_environ_val('CMAKE_FIND_ROOT_PATH_MODE_INCLUDE', 'PATH_MODE_INCLUDE')
+_add_environ_val('CMAKE_FIND_ROOT_PATH_MODE_PACKAGE', 'PATH_MODE_PACKAGE')
 
 # final includes
 env_value = os.environ.get('EXTRA_INCLUDE')


=====================================
contrib/src/main.mak
=====================================
@@ -691,6 +691,7 @@ ifdef HAVE_CROSS_COMPILE
 	CMAKE_TOOLCHAIN_ENV += TOOLCHAIN_PREFIX="$(HOST)-"
 	CMAKE_TOOLCHAIN_ENV += PATH_MODE_LIBRARY="ONLY"
 	CMAKE_TOOLCHAIN_ENV += PATH_MODE_INCLUDE="ONLY"
+	CMAKE_TOOLCHAIN_ENV += PATH_MODE_PACKAGE="ONLY"
 endif
 ifdef HAVE_ANDROID
 # cmake will overwrite our --sysroot with a native (host) one on Darwin



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/72108fc8b3b8fd8022da8f9ffa820ff0fd051b83

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/72108fc8b3b8fd8022da8f9ffa820ff0fd051b83
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance