From 9bc184488157733db4c6d0eb77c334f91db3f3fa Mon Sep 17 00:00:00 2001 From: Mohammed Alyousef Date: Thu, 21 Sep 2023 09:41:49 +0300 Subject: [PATCH] update bootstrap scripts --- CMakeLists.txt | 2 +- scripts/bootstrap_linux.sh | 9 ++++++--- scripts/bootstrap_linux_with_gl.sh | 7 +++++-- scripts/bootstrap_macos.sh | 7 +++++-- scripts/bootstrap_windows.sh | 7 +++++-- 5 files changed, 22 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 588205d..3ad5cc2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -195,7 +195,7 @@ install( include(GNUInstallDirs) if(UNIX AND NOT APPLE) - string(APPEND pc_req_private " x11 xinerama xcursor xfixes xext xrender xft fontconfig libjpeg libpng zlib cairo pango pangoxft pangocairo gobject-2.0 wayland-client wayland-cursor xkbcommon") + string(APPEND pc_req_private " x11 xinerama xcursor xfixes xext xrender xft fontconfig cairo pango pangoxft pangocairo gobject-2.0 wayland-client wayland-cursor xkbcommon") if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") string(APPEND pc_libs_private " -ldbus-1 -lsupc++ -pthread") elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") diff --git a/scripts/bootstrap_linux.sh b/scripts/bootstrap_linux.sh index ed5b4f4..5b93b32 100755 --- a/scripts/bootstrap_linux.sh +++ b/scripts/bootstrap_linux.sh @@ -13,7 +13,10 @@ cmake -B bin -S . \ -DOPTION_BUILD_PDF_DOCUMENTATION=OFF \ -DOPTION_USE_PANGO=ON \ -DOPTION_USE_CAIRO=ON \ - -DOPTION_USE_WAYLAND=OFF \ - -DFLTK_BUILD_FLUID=OFF + -DOPTION_ALLOW_GTK_PLUGIN=OFF \ + -DFLTK_BUILD_FLUID=OFF \ + -DFLTK_BUILD_FLTK_OPTIONS=OFF -sudo cmake --build bin --parallel --target install +cmake --build bin --parallel + +sudo cmake --install bin \ No newline at end of file diff --git a/scripts/bootstrap_linux_with_gl.sh b/scripts/bootstrap_linux_with_gl.sh index 75ca6fc..d8b1799 100755 --- a/scripts/bootstrap_linux_with_gl.sh +++ b/scripts/bootstrap_linux_with_gl.sh @@ -13,7 +13,10 @@ cmake -B bin -S . \ -DOPTION_BUILD_PDF_DOCUMENTATION=OFF \ -DOPTION_USE_PANGO=ON \ -DOPTION_USE_CAIRO=ON \ - -DOPTION_USE_WAYLAND=OFF \ - -DFLTK_BUILD_FLUID=OFF + -DOPTION_ALLOW_GTK_PLUGIN=OFF \ + -DFLTK_BUILD_FLUID=OFF \ + -DFLTK_BUILD_FLTK_OPTIONS=OFF cmake --build bin --parallel + +sudo cmake --install bin \ No newline at end of file diff --git a/scripts/bootstrap_macos.sh b/scripts/bootstrap_macos.sh index d91090d..74c52ac 100755 --- a/scripts/bootstrap_macos.sh +++ b/scripts/bootstrap_macos.sh @@ -10,6 +10,9 @@ cmake -B bin -S . \ -DOPTION_LARGE_FILE=ON \ -DOPTION_BUILD_HTML_DOCUMENTATION=OFF \ -DOPTION_BUILD_PDF_DOCUMENTATION=OFF \ - -DFLTK_BUILD_FLUID=OFF + -DFLTK_BUILD_FLUID=OFF \ + -DFLTK_BUILD_FLTK_OPTIONS=OFF -sudo cmake --build bin --parallel --target install +sudo cmake --build bin --parallel + +sudo cmake --install bin diff --git a/scripts/bootstrap_windows.sh b/scripts/bootstrap_windows.sh index 281fafa..d9a3a4e 100644 --- a/scripts/bootstrap_windows.sh +++ b/scripts/bootstrap_windows.sh @@ -12,6 +12,9 @@ cmake -B bin -S . \ -DOPTION_BUILD_HTML_DOCUMENTATION=OFF \ -DOPTION_BUILD_PDF_DOCUMENTATION=OFF \ -GNinja \ - -DFLTK_BUILD_FLUID=OFF + -DFLTK_BUILD_FLUID=OFF \ + -DFLTK_BUILD_FLTK_OPTIONS=OFF -cmake --build bin --target install --config Release +cmake --build bin --config Release + +sudo cmake --install bin