[ehb54/ultrascan3] e6affe: SOMO CMake: version headers without sh, vcpkg pres...
Branch: refs/heads/ehb54-issue-943 Home: https://github.com/ehb54/ultrascan3 Commit: e6affe806a546205062760c887f27823b9eca684 https://github.com/ehb54/ultrascan3/commit/e6affe806a546205062760c887f27823b... Author: ehb54 <brookes@uthscsa.edu> Date: 2026-10-09 (Fri, 09 Oct 2026) Changed paths: M CMakeLists.txt M us_somo/develop/CMakeLists.txt M us_somo/develop/CMakePresets.json M us_somo/develop/README-cmake.md A us_somo/develop/cmake/SomoGenHeaders.cmake M us_somo/develop/docker/README.md M us_somo/develop/docker/build.sh R us_somo/develop/vcpkg-configuration.json R us_somo/develop/vcpkg.json Log Message: ----------- SOMO CMake: version headers without sh, vcpkg presets on the root setup, review fixes Version headers: cmake/SomoGenHeaders.cmake writes include/us_version.h and include/us_revision.h, as version.sh and revision.sh do for qmake, with only CMake and git. The scripts needed sh, which MSVC Windows lacks, so the first build step failed there. The headers are the same, except that the revision number is no longer padded with spaces on macOS (wc -l). us_somo/develop now also builds on its own, without the rest of the repository or without git: existing headers are kept (somo-dev commits them), missing ones are written with version "unknown" and revision 0, and a sparse checkout reads utils/us_defines.h from git. A missing macOS icon (us_somo/etc) now gives the default icon instead of failing the configure. vcpkg: the SOMO-only presets vcpkg-qt5 and vcpkg-qt6 (and -debug) set vcpkg up as the root presets do: the root manifest with its qt5-app / qt6-app feature, and admin/cmake's toolchain wrapper and overlay triplets. They install the same packages as a root build and share its binary cache; SOMO's own vcpkg.json, whose packages and triplets differed from the root's and so missed that cache, is gone. The docker build's SOMO-only modes use these presets. OpenGL and zlib now come from the system (or the toolchain or vcpkg), as qmake links them, on Linux and macOS. CMake also searches the lib/ next to every PATH directory first, so a program on PATH that bundles its own libz (here a PyMOL install) won, and its bundled libraries then broke the link (undefined uuid_generate@UUID_1.0 in libSM) and would have been loaded at run time. MSVC: SOMO has never been compiled with MSVC (ehb54/ultrascan-tickets#1131). The root build skips it there with a warning; a SOMO-only configure stops. A SOMO-only build tree now runs the programs. SOMO takes the directory above its program's bin/ as its system directory (always on Linux and Windows, on macOS when ULTRASCAN is not set) and expects somo/ and etc/ there, with helpers such as GRPY in bin/ (bin64/ on Linux). qmake builds into us_somo/bin (bin64/ on Linux), inside that layout; the CMake build tree had none of it, so on Linux a second start stopped at an error dialog. The configure step now links somo/ and etc/ to us_somo's (copying them where links cannot be made), copies the platform's helpers from add_to_bin next to the programs, and on Linux links bin64 to bin, as makesomo.sh does. Review fixes: - the MPI and CUDA options and their tools are out of the CMake build until they can be tested; qmake still builds them - Qt's versionless targets (Qt::Core, ...), as the root uses - the us_admin target is us3_admin, like SOMO's other GUI targets; the program is still us_admin - us_saxs_cmds_t keeps all of SOMO's Qt modules, now with the reason: the SOMO headers it compiles include headers from each; of their code it uses only Core, Network and Widgets (QApplication, QProgressBar) - the status line says whether SOMO is configured on its own or as part of the UltraScan build Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> To unsubscribe from these emails, change your notification settings at https://github.com/ehb54/ultrascan3/settings/notifications
participants (1)
-
emre brookes