update bootstrap scripts

MoAlyousef · Sep 21, 2023 · 9bc1844 · 9bc1844
1 parent ea4d7f9
commit 9bc1844
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 10 deletions.
diff --git 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
@@ -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
diff --git 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
diff --git 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
@@ -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