diff options
| author | Brad King <brad.king@kitware.com> | 2023-05-23 15:10:48 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-05-26 13:36:42 (GMT) |
| commit | 4a84f71049742aad11d0399fbc2a98187397bbae (patch) | |
| tree | d90d44995ae7f58ecacfcbf64f0b98b6ed73f8d9 | |
| parent | 5ec69eb58c4d863e9f8f278b7c78d08f8cedd3f4 (diff) | |
| download | CMake-4a84f71049742aad11d0399fbc2a98187397bbae.zip CMake-4a84f71049742aad11d0399fbc2a98187397bbae.tar.gz CMake-4a84f71049742aad11d0399fbc2a98187397bbae.tar.bz2 | |
ci: Provide cppdap in extdeps jobs
Debian 10 and Fedora 37 do not yet package cppdap, so our
base images do not include it. Build it in extdeps jobs.
| -rwxr-xr-x | .gitlab/ci/extdeps-linux.sh | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/.gitlab/ci/extdeps-linux.sh b/.gitlab/ci/extdeps-linux.sh index f0d4c0d..f091525 100755 --- a/.gitlab/ci/extdeps-linux.sh +++ b/.gitlab/ci/extdeps-linux.sh @@ -57,6 +57,25 @@ cmake -S jsoncpp-1.6.0 -B jsoncpp-1.6.0-build \ -DCMAKE_BUILD_TYPE=Release \ -DJSONCPP_LIB_BUILD_STATIC=ON \ -DJSONCPP_LIB_BUILD_SHARED=ON \ + -DJSONCPP_WITH_CMAKE_PACKAGE=ON \ -DCMAKE_INSTALL_PREFIX=/opt/extdeps cmake --build jsoncpp-1.6.0-build --target install +echo >> /opt/extdeps/lib/cmake/jsoncpp/jsoncppConfig.cmake ' +# Backport imported target from jsoncpp 1.9.5. +add_library(JsonCpp::JsonCpp INTERFACE IMPORTED) +set_target_properties(JsonCpp::JsonCpp PROPERTIES INTERFACE_LINK_LIBRARIES "jsoncpp_lib")' rm -rf jsoncpp-1.6.0* + +#---------------------------------------------------------------------------- +# cppdap + +git clone https://github.com/google/cppdap.git +cd cppdap +git checkout 03cc18678ed2ed8b2424ec99dee7e4655d876db5 # 2023-05-25 +cd .. +cmake -S cppdap -B cppdap-build \ + -DCPPDAP_USE_EXTERNAL_JSONCPP_PACKAGE=ON \ + -DCMAKE_INSTALL_PREFIX=/opt/extdeps \ + -DCMAKE_PREFIX_PATH=/opt/extdeps +cmake --build cppdap-build --target install +rm -rf cppdap* |