cmake: tidy-ups #1122
Closed
cmake: tidy-ups #1122
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
For example, `zlib` could appear on the list twice: ``` Requires.private: libssl,libcrypto,zlib,zlib ``` This patch fixes this to: ``` Requires.private: libssl,libcrypto,zlib ``` According to CMake docs `list(REMOVE_DUPLICATES ...)`, is supported by our minimum required CMake version (and by earlier ones even): https://cmake.org/cmake/help/v3.1/command/list.html#remove-duplicates Closes libssh2#1122
2a13020 to
7bb8da9
Compare
Requires.private in libssh2.pcd55563b to
52de0a3
Compare
lampmanyao
pushed a commit
to lampmanyao/libssh2
that referenced
this pull request
Sep 3, 2023
- dedupe `Requires.private` in `libssh2.pc`. `zlib` could appear on the list twice: ``` Requires.private: libssl,libcrypto,zlib,zlib ``` According to CMake docs `list(REMOVE_DUPLICATES ...)`, is supported by our minimum required CMake version (and by earlier ones even): https://cmake.org/cmake/help/v3.1/command/list.html#remove-duplicates - move `cmake_minimum_required()` to the top. - move `set(CMAKE_MODULE_PATH)` to the top. - delete duplicate `set(CMAKE_MODULE_PATH)`. - replace `CMAKE_CURRENT_SOURCE_DIR` with `PROJECT_SOURCE_DIR` in root `CMakeLists.txt` for robustness. - replace `gcovr` option with long-form for readability/consistency. - rename `GCOV_OPTIONS` to `GCOV_CFLAGS`. These are C options we enable when using gcov, not gcov tooling options. Closes libssh2#1122
agreppin
pushed a commit
to agreppin/libssh2
that referenced
this pull request
Jul 14, 2024
- dedupe `Requires.private` in `libssh2.pc`. `zlib` could appear on the list twice: ``` Requires.private: libssl,libcrypto,zlib,zlib ``` According to CMake docs `list(REMOVE_DUPLICATES ...)`, is supported by our minimum required CMake version (and by earlier ones even): https://cmake.org/cmake/help/v3.1/command/list.html#remove-duplicates - move `cmake_minimum_required()` to the top. - move `set(CMAKE_MODULE_PATH)` to the top. - delete duplicate `set(CMAKE_MODULE_PATH)`. - replace `CMAKE_CURRENT_SOURCE_DIR` with `PROJECT_SOURCE_DIR` in root `CMakeLists.txt` for robustness. - replace `gcovr` option with long-form for readability/consistency. - rename `GCOV_OPTIONS` to `GCOV_CFLAGS`. These are C options we enable when using gcov, not gcov tooling options. Closes libssh2#1122
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
dedupe
Requires.privateinlibssh2.pc.zlibcould appear on the list twice:According to CMake docs
list(REMOVE_DUPLICATES ...), is supported by our minimum required CMake version (and by earlier ones even): https://cmake.org/cmake/help/v3.1/command/list.html#remove-duplicatesmove
cmake_minimum_required()to the top.move
set(CMAKE_MODULE_PATH)to the top.delete duplicate
set(CMAKE_MODULE_PATH).replace
CMAKE_CURRENT_SOURCE_DIRwithPROJECT_SOURCE_DIRin rootCMakeLists.txtfor robustness.
replace
gcovroption with long-form for readability/consistency.rename
GCOV_OPTIONStoGCOV_CFLAGS.Closes #1122