From cc966aa9701d991424f750bb7c960ceee4b75f88 Mon Sep 17 00:00:00 2001 From: Brett Jia Date: Wed, 7 Aug 2024 12:53:50 -0400 Subject: [PATCH] fix usage of include dirs (#83) --- scripts/build_cosmo.sh | 4 ++-- scripts/build_freebsd.sh | 8 ++++---- scripts/build_linux_zig.sh | 8 ++++---- scripts/build_macos.sh | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/scripts/build_cosmo.sh b/scripts/build_cosmo.sh index 8b82fa1c..2d0640a6 100755 --- a/scripts/build_cosmo.sh +++ b/scripts/build_cosmo.sh @@ -219,11 +219,11 @@ cmake \ -DLZMA_LIBRARY:FILEPATH=${DEPSDIR}/lib/liblzma.a \ -DBZIP2_INCLUDE_DIR:PATH=${DEPSDIR}/include \ -DBZIP2_LIBRARIES:FILEPATH=${DEPSDIR}/lib/libbz2.a \ - -DREADLINE_INCLUDE_PATH:FILEPATH=${DEPSDIR}/include/readline/readline.h \ + -DREADLINE_INCLUDE_PATH:PATH=${DEPSDIR}/include \ -DREADLINE_LIBRARY:FILEPATH=${DEPSDIR}/lib/libreadline.a \ -DCURSES_LIBRARIES:FILEPATH=${DEPSDIR}/lib/libncurses.a \ -DPANEL_LIBRARIES:FILEPATH=${DEPSDIR}/lib/libpanel.a \ - -DGDBM_INCLUDE_PATH:FILEPATH=${DEPSDIR}/include/gdbm.h \ + -DGDBM_INCLUDE_PATH:PATH=${DEPSDIR}/include \ -DGDBM_LIBRARY:FILEPATH=${DEPSDIR}/lib/libgdbm.a \ -DGDBM_COMPAT_LIBRARY:FILEPATH=${DEPSDIR}/lib/libgdbm_compat.a \ -DNDBM_TAG=NDBM \ diff --git a/scripts/build_freebsd.sh b/scripts/build_freebsd.sh index e6506a69..c73b8f3f 100755 --- a/scripts/build_freebsd.sh +++ b/scripts/build_freebsd.sh @@ -388,18 +388,18 @@ cmake \ -DBZIP2_LIBRARIES:FILEPATH=${DEPSDIR}/lib/libbz2.a \ -DLibFFI_INCLUDE_DIR:PATH=${DEPSDIR}/include \ -DLibFFI_LIBRARY:FILEPATH=${DEPSDIR}/lib/libffi.so \ - -DREADLINE_INCLUDE_PATH:FILEPATH=${DEPSDIR}/include/readline/readline.h \ + -DREADLINE_INCLUDE_PATH:PATH=${DEPSDIR}/include \ -DREADLINE_LIBRARY:FILEPATH=${DEPSDIR}/lib/libreadline.so \ -DCURSES_LIBRARIES:FILEPATH=${DEPSDIR}/lib/libncurses.so \ -DPANEL_LIBRARIES:FILEPATH=${DEPSDIR}/lib/libpanel.so \ - -DGDBM_INCLUDE_PATH:FILEPATH=${DEPSDIR}/include/gdbm.h \ + -DGDBM_INCLUDE_PATH:PATH=${DEPSDIR}/include \ -DGDBM_LIBRARY:FILEPATH=${DEPSDIR}/lib/libgdbm.so \ -DGDBM_COMPAT_LIBRARY:FILEPATH=${DEPSDIR}/lib/libgdbm_compat.so \ -DNDBM_TAG=NDBM \ -DNDBM_USE=NDBM \ - -DTK_INCLUDE_PATH:FILEPATH=${DEPSDIR}/include/tk.h \ + -DTK_INCLUDE_PATH:PATH=${DEPSDIR}/include \ -DTK_LIBRARY:FILEPATH=${DEPSDIR}/lib/libtk8.6.so \ - -DTCL_INCLUDE_PATH:FILEPATH=${DEPSDIR}/include/tcl.h \ + -DTCL_INCLUDE_PATH:PATH=${DEPSDIR}/include \ -DTCL_LIBRARY:FILEPATH=${DEPSDIR}/lib/libtcl8.6.so \ -DX11_INCLUDE_DIR:PATH=${DEPSDIR}/include/X11 \ -DX11_LIBRARIES="${DEPSDIR}/lib/libXau.so;${DEPSDIR}/lib/libXdmcp.so;${DEPSDIR}/lib/libX11.so;${DEPSDIR}/lib/libXext.so;${DEPSDIR}/lib/libICE.so;${DEPSDIR}/lib/libSM.so;${DEPSDIR}/lib/libXrender.so;${DEPSDIR}/lib/libXft.so;${DEPSDIR}/lib/libXss.so;${DEPSDIR}/lib/libxcb.so" \ diff --git a/scripts/build_linux_zig.sh b/scripts/build_linux_zig.sh index f65b24c1..6ee53f27 100755 --- a/scripts/build_linux_zig.sh +++ b/scripts/build_linux_zig.sh @@ -528,19 +528,19 @@ LDFLAGS="${LDFLAGS} -lfontconfig -lfreetype" cmake \ -DBZIP2_LIBRARIES:FILEPATH=${DEPSDIR}/lib/libbz2.a \ -DLibFFI_INCLUDE_DIR:PATH=${DEPSDIR}/include \ -DLibFFI_LIBRARY:FILEPATH=${DEPSDIR}/lib/libffi.a \ - -DREADLINE_INCLUDE_PATH:FILEPATH=${DEPSDIR}/include/readline/readline.h \ + -DREADLINE_INCLUDE_PATH:PATH=${DEPSDIR}/include \ -DREADLINE_LIBRARY:FILEPATH=${DEPSDIR}/lib/libreadline.a \ -DUUID_LIBRARY:FILEPATH=${DEPSDIR}/lib/libuuid.a \ -DCURSES_LIBRARIES:FILEPATH=${DEPSDIR}/lib/libncurses.a \ -DPANEL_LIBRARIES:FILEPATH=${DEPSDIR}/lib/libpanel.a \ - -DGDBM_INCLUDE_PATH:FILEPATH=${DEPSDIR}/include/gdbm.h \ + -DGDBM_INCLUDE_PATH:PATH=${DEPSDIR}/include \ -DGDBM_LIBRARY:FILEPATH=${DEPSDIR}/lib/libgdbm.a \ -DGDBM_COMPAT_LIBRARY:FILEPATH=${DEPSDIR}/lib/libgdbm_compat.a \ -DNDBM_TAG=NDBM \ -DNDBM_USE=NDBM \ - -DTK_INCLUDE_PATH:FILEPATH=${DEPSDIR}/include/tk.h \ + -DTK_INCLUDE_PATH:PATH=${DEPSDIR}/include \ -DTK_LIBRARY:FILEPATH=${DEPSDIR}/lib/libtk8.6.a \ - -DTCL_INCLUDE_PATH:FILEPATH=${DEPSDIR}/include/tcl.h \ + -DTCL_INCLUDE_PATH:PATH=${DEPSDIR}/include \ -DTCL_LIBRARY:FILEPATH=${DEPSDIR}/lib/libtcl8.6.a \ -DX11_INCLUDE_DIR:PATH=${DEPSDIR}/include/X11 \ -DX11_LIBRARIES="${DEPSDIR}/lib/libXau.a;${DEPSDIR}/lib/libXdmcp.a;${DEPSDIR}/lib/libX11.a;${DEPSDIR}/lib/libXext.a;${DEPSDIR}/lib/libICE.a;${DEPSDIR}/lib/libSM.a;${DEPSDIR}/lib/libXrender.a;${DEPSDIR}/lib/libXft.a;${DEPSDIR}/lib/libXss.a;${DEPSDIR}/lib/libxcb.a" \ diff --git a/scripts/build_macos.sh b/scripts/build_macos.sh index 0f07d85c..571b4e31 100755 --- a/scripts/build_macos.sh +++ b/scripts/build_macos.sh @@ -297,19 +297,19 @@ cmake \ -DBZIP2_LIBRARIES:FILEPATH=${DEPSDIR}/lib/libbz2.a \ -DLibFFI_INCLUDE_DIR:PATH=${DEPSDIR}/include \ -DLibFFI_LIBRARY:FILEPATH=${DEPSDIR}/lib/libffi.a \ - -DREADLINE_INCLUDE_PATH:FILEPATH=${DEPSDIR}/include/readline/readline.h \ + -DREADLINE_INCLUDE_PATH:PATH=${DEPSDIR}/include \ -DREADLINE_LIBRARY:FILEPATH=${DEPSDIR}/lib/libreadline.a \ -DUUID_LIBRARY:FILEPATH=${DEPSDIR}/lib/libuuid.a \ -DCURSES_LIBRARIES:FILEPATH=${DEPSDIR}/lib/libncurses.a \ -DPANEL_LIBRARIES:FILEPATH=${DEPSDIR}/lib/libpanel.a \ - -DGDBM_INCLUDE_PATH:FILEPATH=${DEPSDIR}/include/gdbm.h \ + -DGDBM_INCLUDE_PATH:PATH=${DEPSDIR}/include \ -DGDBM_LIBRARY:FILEPATH=${DEPSDIR}/lib/libgdbm.a \ -DGDBM_COMPAT_LIBRARY:FILEPATH=${DEPSDIR}/lib/libgdbm_compat.a \ -DNDBM_TAG=NDBM \ -DNDBM_USE=NDBM \ - -DTK_INCLUDE_PATH:FILEPATH=${DEPSDIR}/include/tk.h \ + -DTK_INCLUDE_PATH:PATH=${DEPSDIR}/include \ -DTK_LIBRARY:FILEPATH=${DEPSDIR}/lib/libtk8.6.a \ - -DTCL_INCLUDE_PATH:FILEPATH=${DEPSDIR}/include/tcl.h \ + -DTCL_INCLUDE_PATH:PATH=${DEPSDIR}/include \ -DTCL_LIBRARY:FILEPATH=${DEPSDIR}/lib/libtcl8.6.a \ ../portable-python-cmake-buildsystem make -j${NPROC}