Skip to content

Commit e8949e2

Browse files
committed
Update ccws flags
1 parent 15f3991 commit e8949e2

File tree

3 files changed

+6
-18
lines changed

3 files changed

+6
-18
lines changed

frontend/CMakeLists.txt

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
cmake_minimum_required(VERSION 3.8)
22
project(intrometry_frontend VERSION 1.0.0 LANGUAGES CXX)
33

4-
if(CCWS_CLANG_TIDY)
5-
set(CMAKE_CXX_CLANG_TIDY "${CCWS_CLANG_TIDY}" CACHE STRING "" FORCE)
6-
endif()
7-
if(CCWS_CXX_FLAGS)
8-
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CCWS_CXX_FLAGS}")
9-
set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${CCWS_LINKER_FLAGS}")
10-
else()
4+
include(ccws_set_cmake_flags OPTIONAL RESULT_VARIABLE CCWS_ON)
5+
if(NOT CCWS_ON)
116
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
127
set(CMAKE_VERBOSE_MAKEFILE ON)
138

pjmsg_topic/CMakeLists.txt

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
cmake_minimum_required(VERSION 3.8)
22
project(intrometry_pjmsg_topic VERSION 1.0.0 LANGUAGES CXX)
33

4-
if(CCWS_CLANG_TIDY)
5-
set(CMAKE_CXX_CLANG_TIDY "${CCWS_CLANG_TIDY}" CACHE STRING "" FORCE)
6-
endif()
7-
if(CCWS_CXX_FLAGS)
8-
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CCWS_CXX_FLAGS}")
9-
set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${CCWS_LINKER_FLAGS}")
10-
else()
4+
include(ccws_set_cmake_flags OPTIONAL RESULT_VARIABLE CCWS_ON)
5+
if(NOT CCWS_ON)
116
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
127
set(CMAKE_VERBOSE_MAKEFILE ON)
138

tests/CMakeLists.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
cmake_minimum_required(VERSION 3.8)
22
project(intrometry_tests VERSION 1.0.0 LANGUAGES CXX)
33

4-
if(CCWS_CXX_FLAGS)
5-
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CCWS_CXX_FLAGS}")
6-
set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${CCWS_LINKER_FLAGS}")
7-
else()
4+
include(ccws_set_cmake_flags OPTIONAL RESULT_VARIABLE CCWS_ON)
5+
if(NOT CCWS_ON)
86
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
97
set(CMAKE_VERBOSE_MAKEFILE ON)
108

0 commit comments

Comments
 (0)