Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cmake: distcheck for files in CMake subdir #14323

Closed
wants to merge 1 commit into from

Conversation

vszakats
Copy link
Member

@vszakats vszakats commented Jul 31, 2024

  • add CMake option to verify if the CMake/*.cmake, CMake/*.in files
    are listed as distributable in autotools' EXTRA_DIST. The check can
    be enabled with -DENABLE_DIST_TEST=ON CMake option.

  • add CI job to that effect.

Ref: #14320
Closes #14323


IN_LIST is CMake 3.3: https://cmake.org/cmake/help/latest/command/if.html#in-list

@vszakats vszakats added the cmake label Jul 31, 2024
@github-actions github-actions bot added the CI Continuous Integration label Jul 31, 2024
@vszakats
Copy link
Member Author

vszakats commented Jul 31, 2024

Fail check successful:

CMake Error at CMakeLists.txt:1675 (message):
  Source file missing from the Makefile.inc CMAKE_DIST list:
  CMake/FindNettle.cmake

https://github.com/curl/curl/actions/runs/10179228619/job/28154528586?pr=14323#step:3:346

Makefile.am Outdated Show resolved Hide resolved
@vszakats vszakats force-pushed the cmake-module-distcheck branch from 732ea32 to 43dd5bb Compare July 31, 2024 11:02
@vszakats
Copy link
Member Author

vszakats commented Jul 31, 2024

Cut it back a little. It adds an extra .inc file to the root, and this is disturbing.

@vszakats
Copy link
Member Author

Now without the extra file, with a small, hopefully non-offensive hack.

@vszakats vszakats force-pushed the cmake-module-distcheck branch from e59015c to 6888340 Compare July 31, 2024 14:39
@vszakats vszakats changed the title cmake: distcheck for CMake subdir cmake: distcheck for for files in CMake subdir Jul 31, 2024
@vszakats vszakats force-pushed the cmake-module-distcheck branch from 6888340 to 76d60f4 Compare July 31, 2024 16:52
- add CMake option to verify if the `CMake/*.cmake`, `CMake/*.in` files
  are listed as distributable in autotools' `EXTRA_DIST`. The check can
  be enabled with `-DENABLE_DIST_TEST=ON` CMake option.

- add CI job to that effect.

Ref: curl#14320
Closes curl#14323
@vszakats vszakats force-pushed the cmake-module-distcheck branch from 76d60f4 to c293427 Compare July 31, 2024 18:49
@vszakats vszakats changed the title cmake: distcheck for for files in CMake subdir cmake: distcheck for files in CMake subdir Jul 31, 2024
@vszakats vszakats closed this in a118a6e Jul 31, 2024
@vszakats vszakats deleted the cmake-module-distcheck branch July 31, 2024 20:33
vszakats added a commit to vszakats/curl that referenced this pull request Aug 9, 2024
vszakats added a commit that referenced this pull request Aug 10, 2024
Also:
- delete previous, cmake-specific solution.
- move a CI script under `.github`.

Follow-up to a118a6e #14323
Closes #14463
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI Continuous Integration cmake tests
Development

Successfully merging this pull request may close these issues.

2 participants