Improve C/C++ flags

master
Melroy van den Berg 2022-01-22 17:09:54 +01:00
parent 0e0f4b6e7f
commit 0ab04c1801
No known key found for this signature in database
GPG Key ID: 71D11FF23454B9D7
5 changed files with 23 additions and 17 deletions

View File

@ -23,7 +23,7 @@ jobs:
submodules: true
- name: Install dep packages
run: sudo apt install libcurl4-openssl-dev libgtkmm-3.0-dev
run: sudo apt install libcurl4-openssl-dev libgtkmm-3.0-dev doxygen graphviz
- name: Initialize CodeQL
uses: github/codeql-action/init@v1

View File

@ -14,20 +14,19 @@ project(libreweb-browser
message(STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
message(STATUS "PROJECT_VERSION: ${PROJECT_VERSION}")
# Build docs
# Build docs using Doxygen
if(DOXYGEN)
include(Doxygen)
endif()
# Production build
# Production build, let's include the CPack settings
if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
# Include CPack packaging settings
include(Packaging)
endif()
set(CMAKE_C_STANDARD 99)
#set(CMAKE_C_STANDARD_REQUIRED YES)
#set(CMAKE_C_EXTENSIONS NO)
set(CMAKE_C_STANDARD_REQUIRED YES)
set(CMAKE_C_EXTENSIONS NO)
set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
@ -35,6 +34,17 @@ if(NOT CYGWIN)
set(CMAKE_CXX_EXTENSIONS OFF)
endif()
if(WIN32)
set(WINDOWS_FLAGS -mwindows)
endif()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror")
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall")
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -DNDEBUG")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${WINDOWS_FLAGS} -O3 -DNDEBUG")
# Disable CTest testcases & install in cpp-ipfs-http-client
set (BUILD_TESTING OFF CACHE BOOL "Disable CTest" FORCE)
set (DISABLE_INSTALL ON CACHE BOOL "Disable Install" FORCE)

@ -1 +1 @@
Subproject commit 1bf5f9505fb8c15f805f7b41f9a1a5c070cca465
Subproject commit 828a86c3cad982ad419c7e85eb84e1984b9fe42d

View File

@ -1,13 +1,16 @@
project(whereami)
set(TARGET_NAME ${PROJECT_NAME})
set(LIBARY_NAME ${PROJECT_NAME})
# Create static library
add_library(${TARGET_NAME} STATIC whereami.c)
add_library(${LIBARY_NAME} STATIC whereami.c)
# Add X/Open definition for realpath
target_compile_definitions(${LIBARY_NAME} PUBLIC _XOPEN_SOURCE=500)
# Use PUBLIC iso INTERFACE, so the library itself also finds it's own header file
target_include_directories(
${TARGET_NAME}
${LIBARY_NAME}
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)

View File

@ -3,13 +3,6 @@ include(${CMAKE_SOURCE_DIR}/cmake/GSettings.cmake)
set(PROJECT_TARGET libreweb-browser)
set(THREADS_PREFER_PTHREAD_FLAG ON)
if(WIN32)
set(WINDOWS_FLAGS -mwindows)
endif()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${WINDOWS_FLAGS} -O3 -DNDEBUG")
# Find required dependencies
find_package(Threads REQUIRED)
find_package(PkgConfig REQUIRED)