Skip to content

Commit 9f08b87

Browse files
committed
Revert unnecessary tools CMake change
1 parent 84ae701 commit 9f08b87

1 file changed

Lines changed: 22 additions & 24 deletions

File tree

tools/CMakeLists.txt

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -81,33 +81,31 @@ endif()
8181

8282
source_group(NAM ${CMAKE_CURRENT_SOURCE_DIR} FILES ${NAM_SOURCES})
8383

84-
foreach(TOOL_TARGET IN LISTS TOOLS)
85-
target_compile_features(${TOOL_TARGET} PUBLIC cxx_std_20)
84+
target_compile_features(${TOOLS} PUBLIC cxx_std_20)
8685

87-
set_target_properties(${TOOL_TARGET}
88-
PROPERTIES
89-
CXX_VISIBILITY_PRESET hidden
90-
INTERPROCEDURAL_OPTIMIZATION TRUE
91-
PREFIX ""
92-
)
86+
set_target_properties(${TOOLS}
87+
PROPERTIES
88+
CXX_VISIBILITY_PRESET hidden
89+
INTERPROCEDURAL_OPTIMIZATION TRUE
90+
PREFIX ""
91+
)
9392

94-
if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
95-
target_compile_definitions(${TOOL_TARGET} PRIVATE NOMINMAX WIN32_LEAN_AND_MEAN)
96-
endif()
93+
if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
94+
target_compile_definitions(${TOOLS} PRIVATE NOMINMAX WIN32_LEAN_AND_MEAN)
95+
endif()
9796

98-
if (MSVC)
99-
target_compile_options(${TOOL_TARGET} PRIVATE
100-
"$<$<CONFIG:DEBUG>:/W4>"
101-
"$<$<CONFIG:RELEASE>:/O2>"
102-
)
103-
else()
104-
target_compile_options(${TOOL_TARGET} PRIVATE
105-
-Wall -Wextra -Wpedantic -Wstrict-aliasing -Wunreachable-code -Weffc++ -Wno-unused-parameter
106-
"$<$<CONFIG:DEBUG>:-Og;-ggdb;-Werror>"
107-
"$<$<CONFIG:RELEASE>:-Ofast>"
108-
)
109-
endif()
110-
endforeach()
97+
if (MSVC)
98+
target_compile_options(${TOOLS} PRIVATE
99+
"$<$<CONFIG:DEBUG>:/W4>"
100+
"$<$<CONFIG:RELEASE>:/O2>"
101+
)
102+
else()
103+
target_compile_options(${TOOLS} PRIVATE
104+
-Wall -Wextra -Wpedantic -Wstrict-aliasing -Wunreachable-code -Weffc++ -Wno-unused-parameter
105+
"$<$<CONFIG:DEBUG>:-Og;-ggdb;-Werror>"
106+
"$<$<CONFIG:RELEASE>:-Ofast>"
107+
)
108+
endif()
111109

112110
# There's an error in eigen's
113111
# /Users/steve/src/NeuralAmpModelerCore/Dependencies/eigen/Eigen/src/Core/products/GeneralBlockPanelKernel.h

0 commit comments

Comments
 (0)