Skip to content

Commit fcd0438

Browse files
authored
Revert "Hide generated source files from clang-tidy (#471)"
This reverts commit a7a2dab.
1 parent a7a2dab commit fcd0438

File tree

3 files changed

+4
-20
lines changed

3 files changed

+4
-20
lines changed

phlex/app/CMakeLists.txt

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
configure_file(version.cpp.in version.cpp @ONLY)
2-
3-
add_library(version_obj OBJECT version.cpp)
4-
52
# version.cpp is generated into the build directory; clang-tidy cannot find
63
# .clang-tidy by walking the build-dir path, so disable linting for this file.
7-
set_target_properties(version_obj PROPERTIES CXX_CLANG_TIDY "" POSITION_INDEPENDENT_CODE TRUE)
8-
target_include_directories(version_obj PRIVATE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}/include)
4+
set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/version.cpp PROPERTIES CXX_CLANG_TIDY "")
95

106
cet_make_library(
117
LIBRARY_NAME
@@ -14,15 +10,14 @@ cet_make_library(
1410
SOURCE
1511
load_module.cpp
1612
run.cpp
13+
version.cpp
1714
LIBRARIES
1815
PUBLIC
1916
# FIXME: We probably also need to add (and/or replace with) the future library
2017
# that will be including phlex/driver.hpp
2118
phlex::core
2219
Boost::json
2320
Boost::boost
24-
PRIVATE
25-
version_obj
2621
)
2722

2823
install(FILES load_module.hpp run.hpp version.hpp DESTINATION include/phlex/app)

test/form/data_products/CMakeLists.txt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
set(FORM_DATA_PROD_LIB_NAME "form_test_data_products")
2-
add_library(track_start_obj OBJECT track_start.cpp)
3-
set_target_properties(track_start_obj PROPERTIES POSITION_INDEPENDENT_CODE ON)
4-
target_include_directories(track_start_obj PRIVATE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}/include)
5-
add_library(${FORM_DATA_PROD_LIB_NAME} SHARED $<TARGET_OBJECTS:track_start_obj>)
2+
add_library(${FORM_DATA_PROD_LIB_NAME} SHARED track_start.cpp)
63

74
set_target_properties(
85
${FORM_DATA_PROD_LIB_NAME}
@@ -16,7 +13,6 @@ if(FORM_USE_ROOT_STORAGE)
1613
${FORM_DATA_PROD_LIB_NAME} dict.h SELECTION classes_def.xml
1714
)
1815
target_link_libraries(${FORM_DATA_PROD_LIB_NAME} PRIVATE ROOT::RIO)
19-
set_target_properties(${FORM_DATA_PROD_LIB_NAME} PROPERTIES CXX_CLANG_TIDY "")
2016

2117
add_subdirectory(extra_member)
2218
endif()
Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
set(FORM_EXTRA_DATA_PROD_LIB_NAME "form_test_data_products_schema_evolution")
2-
add_library(em_track_start_obj OBJECT track_start.cpp)
3-
set_target_properties(em_track_start_obj PROPERTIES POSITION_INDEPENDENT_CODE ON)
4-
target_include_directories(
5-
em_track_start_obj
6-
PRIVATE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}/include
7-
)
8-
add_library(${FORM_EXTRA_DATA_PROD_LIB_NAME} SHARED $<TARGET_OBJECTS:em_track_start_obj>)
2+
add_library(${FORM_EXTRA_DATA_PROD_LIB_NAME} SHARED track_start.cpp)
93

104
if(FORM_USE_ROOT_STORAGE)
115
find_package(ROOT REQUIRED COMPONENTS RIO)
@@ -14,5 +8,4 @@ if(FORM_USE_ROOT_STORAGE)
148
${FORM_EXTRA_DATA_PROD_LIB_NAME} dict.h SELECTION classes_def.xml
159
)
1610
target_link_libraries(${FORM_EXTRA_DATA_PROD_LIB_NAME} PRIVATE ROOT::RIO)
17-
set_target_properties(${FORM_EXTRA_DATA_PROD_LIB_NAME} PROPERTIES CXX_CLANG_TIDY "")
1811
endif()

0 commit comments

Comments
 (0)