[ehb54/ultrascan3] d90378: SOMO CMake: build against an existing Qt and a qma...
Branch: refs/heads/ehb54-issue-943 Home: https://github.com/ehb54/ultrascan3 Commit: d9037804b2b4f05a566f54ad6f73a28be0a51206 https://github.com/ehb54/ultrascan3/commit/d9037804b2b4f05a566f54ad6f73a28be... Author: ehb54 <brookes@uthscsa.edu> Date: 2026-10-05 (Mon, 05 Oct 2026) Changed paths: M us_somo/develop/CMakeLists.txt Log Message: ----------- SOMO CMake: build against an existing Qt and a qmake-built Qwt (macOS, MSYS2) The CMake build took Qwt only from vcpkg and required OpenSSL, so it could not configure against the Qt and Qwt that the qmake build and the macOS and MSYS2 packaging use. Now: - Qwt: after the root's Qwt::Qwt and vcpkg's unofficial-qwt, look in QWTDIR (default $QWTDIR, which qt5env sets): library in lib/ (qwt.framework on macOS), headers in src/. - OpenSSL dropped: no SOMO source includes it, and qmake never linked it. - Threads linked: us_zeno_cxx.cpp uses std::thread (the MinGW qmake template links winpthread). - Platform macros as qmake defines them, for every SOMO target: macOS UNIX MACX OSX MAC, Windows WIN32 MINGW __WIN64__, Linux unchanged. On macOS UNIX was missing, and the tools had no platform macros on macOS or Windows. - Windows: US_MAKE_DLL US_MAKE_GUI_DLL only while building the DLL, as libus_somo.pro does; us_saxs_cmds_t is not built, as under qmake. - NDEBUG dropped, from the Release flags and from the compile options the root adds for Release: it compiles out assert(), which qmake's release builds keep; ZENO, us_eigen.cpp and the global fits have live asserts. - macOS standalone: use the selected Xcode's SDK (CMAKE_OSX_SYSROOT macosx), as qmake does. CMake 4 picks none, and the compiler's default SDK can be newer than the selected Xcode's clang can parse. Verified on an arm64 Mac (Qt 5.15.19 + Qwt 6.3.0 from the packaging setup, Xcode 13.4.1, CMake 4.4): somo-dev with these files builds, its compile defines match qmake's (QT_NO_STL aside, which changes no preprocessed output), and us_saxs_cmds_t runs. Linux standalone and root builds, Qt 5 and Qt 6, on main and on somo-dev, still pass. Windows (MSYS2) is not yet built. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Commit: 52ab324aa1c068ac9d77feccd2c15825ed5cd236 https://github.com/ehb54/ultrascan3/commit/52ab324aa1c068ac9d77feccd2c15825e... Author: ehb54 <brookes@uthscsa.edu> Date: 2026-10-05 (Mon, 05 Oct 2026) Changed paths: M .gitignore A us_somo/develop/CMakePresets.json A us_somo/develop/README-cmake.md Log Message: ----------- SOMO CMake: presets for the terminal, VS Code and Qt Creator us_somo/develop/CMakePresets.json builds SOMO against Qt 5 and the qmake-built Qwt from QTDIR and QWTDIR, as qt5env sets them: - qt5 on macOS and Linux; - qt5-msys2 on Windows, for the MSYS2 MINGW64 shell (MSYS Makefiles). VS Code (CMake Tools) and Qt Creator read the same presets, and a developer's own paths go in CMakeUserPresets.json, which git now ignores, as it does the preset build trees under us_somo/develop/build/. README-cmake.md describes the terminal, editor and vcpkg routes. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Compare: https://github.com/ehb54/ultrascan3/compare/e18b3d3a059e...52ab324aa1c0 To unsubscribe from these emails, change your notification settings at https://github.com/ehb54/ultrascan3/settings/notifications
participants (1)
-
emre brookes