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.

Sign up for GitHub

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

add cmakelint #228

Merged
merged 2 commits into from
Feb 15, 2022
Merged

add cmakelint #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5dab5b4
ci/ccheck: add cmakelint
sreimers Feb 15, 2022
d25150f
cmake: fix linter errors
sreimers Feb 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/ccheck.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,7 @@ jobs:
run: |
wget "https://raw.githubusercontent.com/baresip/baresip/main/test/ccheck.py"
python3 ccheck.py
- name: CMakeLint
run: |
pip install cmakelint
~/.local/bin/cmakelint
8 changes: 4 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ project(re VERSION 2.0.1 LANGUAGES C)
# Increment for breaking changes (dev.2, dev.3...)
set(PROJECT_VERSION_PRE dev13)

if (PROJECT_VERSION_PRE)
if(PROJECT_VERSION_PRE)
set(PROJECT_VERSION_FULL ${PROJECT_VERSION}-${PROJECT_VERSION_PRE})
else()
set(PROJECT_VERSION_FULL ${PROJECT_VERSION})
Expand All @@ -35,7 +35,7 @@ find_package(OpenSSL)
option(USE_OPENSSL "Enable OpenSSL" ${OPENSSL_FOUND})


if (MSVC)
if(MSVC)
add_compile_options(/W4)
else()
add_compile_options(-Wall)
Expand Down Expand Up @@ -404,9 +404,9 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
PUBLIC "-framework SystemConfiguration" "-framework CoreFoundation"
)
endif()
target_link_libraries(re-static
target_link_libraries(re-static
PUBLIC -lssl -lcrypto -lpthread
PRIVATE -L/opt/local/lib
PRIVATE -L/opt/local/lib
)

set_target_properties(re-static PROPERTIES PUBLIC_HEADER include/re.h)
Expand Down