Archives/lokinet
2
0
Fork 0
mirror of https://github.com/oxen-io/lokinet.git synced 2024-11-15 12:13:24 +00:00
Code Issues Projects Releases Wiki Activity
197cb0eca6
lokinet/cmake/gui-option.cmake

18 lines
466 B
CMake
Raw Normal View History

fix macos assemble_gui dependency The `sign` target on macos was not working properly -- the signing script would run before the build is finished. This was caused by cmake/macos.cmake having an `if(BUILD_GUI)`, but BUILD_GUI isn't defined as an option until cmake/gui.cmake, which hadn't been included yet where macos.cmake was included. This extracts just the `option(BUIL_GUI)` from gui.cmake into a separate gui-option.cmake file that we can load earlier to fix it. While here I also noticed the GUI_EXE setting was defined as an option, but isn't actually a boolean value, as an option, but isn't actually a boolean value, so fixed it by making it a `set(... CACHE FILEPATH ...)`.
2022-10-03 15:18:40 +00:00
set(default_build_gui OFF)
if(APPLE OR WIN32)
set(default_build_gui ON)
endif()
Windows prebuilt gui fixes Currently you can't use GUI_EXE without BUILD_GUI, but BUILD_GUI also requires the yarn command (even though it will never use it when GUI_EXE is set). This commit fixes it: - Make `GUI_EXE` a windows-only top-level project options, rather than being guarded by `BUILD_GUI`. - Make `BUILD_GUI` control *building* the GUI instead of bundling it. - GUI_EXE and BUILD_GUI are now mutually exclusive.
2022-10-26 18:06:06 +00:00
if(WIN32)
set(GUI_EXE "" CACHE FILEPATH "path to a pre-built Windows GUI .exe to use (implies -DBUILD_GUI=OFF)")
if(GUI_EXE)
set(default_build_gui OFF)
endif()
endif()
fix macos assemble_gui dependency The `sign` target on macos was not working properly -- the signing script would run before the build is finished. This was caused by cmake/macos.cmake having an `if(BUILD_GUI)`, but BUILD_GUI isn't defined as an option until cmake/gui.cmake, which hadn't been included yet where macos.cmake was included. This extracts just the `option(BUIL_GUI)` from gui.cmake into a separate gui-option.cmake file that we can load earlier to fix it. While here I also noticed the GUI_EXE setting was defined as an option, but isn't actually a boolean value, as an option, but isn't actually a boolean value, so fixed it by making it a `set(... CACHE FILEPATH ...)`.
2022-10-03 15:18:40 +00:00
option(BUILD_GUI "build electron gui from 'gui' submodule source" ${default_build_gui})
Windows prebuilt gui fixes Currently you can't use GUI_EXE without BUILD_GUI, but BUILD_GUI also requires the yarn command (even though it will never use it when GUI_EXE is set). This commit fixes it: - Make `GUI_EXE` a windows-only top-level project options, rather than being guarded by `BUILD_GUI`. - Make `BUILD_GUI` control *building* the GUI instead of bundling it. - GUI_EXE and BUILD_GUI are now mutually exclusive.
2022-10-26 18:06:06 +00:00
if(BUILD_GUI AND GUI_EXE)
message(FATAL_ERROR "-DGUI_EXE=... and -DBUILD_GUI=ON are mutually exclusive")
endif()
Reference in New Issue Copy Permalink