Skip to content

Commit 5ead0b7

Browse files
committed
build: Avoid sending warnings to users
1 parent 5190667 commit 5ead0b7

File tree

1 file changed

+13
-7
lines changed

1 file changed

+13
-7
lines changed

CMakeLists.txt

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@ target_include_directories(inicpp INTERFACE
1616
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
1717
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
1818

19-
target_compile_options(inicpp INTERFACE
20-
$<$<CXX_COMPILER_ID:GNU,Clang>:-Wall;-Wextra>
21-
$<$<CXX_COMPILER_ID:MSVC>:/WX;/wd4530>
22-
)
23-
2419
if(NOT DEFINED INIFILE_CPP_MASTER_PROJECT)
2520
if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
2621
set(INIFILE_CPP_MASTER_PROJECT ON)
@@ -29,17 +24,28 @@ if(NOT DEFINED INIFILE_CPP_MASTER_PROJECT)
2924
endif()
3025
endif()
3126

27+
if(INIFILE_CPP_MASTER_PROJECT)
28+
target_compile_options(inicpp INTERFACE
29+
$<$<CXX_COMPILER_ID:GNU,Clang>:-Wall;-Wextra>
30+
$<$<CXX_COMPILER_ID:MSVC>:/W4>
31+
)
32+
endif()
33+
3234
option(GENERATE_COVERAGE "Enable generating code coverage" ${INIFILE_CPP_MASTER_PROJECT})
3335
option(BUILD_TESTS "Enable building unit tests" ${INIFILE_CPP_MASTER_PROJECT})
3436
option(BUILD_EXAMPLES "Enable building example applications" ${INIFILE_CPP_MASTER_PROJECT})
3537

36-
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/inicpp.h TYPE INCLUDE)
38+
install(DIRECTORY include/
39+
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
40+
FILES_MATCHING
41+
PATTERN "*.h"
42+
)
3743

3844
if(GENERATE_COVERAGE AND CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
3945
# Add required flags (GCC & LLVM/Clang)
4046
target_compile_options(inicpp INTERFACE -O0 -g --coverage)
4147
target_link_options(inicpp INTERFACE --coverage)
42-
endif(GENERATE_COVERAGE AND CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
48+
endif()
4349

4450
if(BUILD_TESTS)
4551
message(STATUS "[inicpp] Building unit tests")

0 commit comments

Comments
 (0)