Skip to content

Commit fabdd85

Browse files
committed
simplify
1 parent 8832000 commit fabdd85

File tree

1 file changed

+4
-11
lines changed

1 file changed

+4
-11
lines changed

cmake/ModuleHelpers.cmake

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ macro(_userver_module_find_part)
110110
# return()
111111
# endif()
112112

113-
set(options OPTIONAL)
113+
set(options)
114114
set(oneValueArgs PART_TYPE)
115115
set(multiValueArgs NAMES PATHS PATH_SUFFIXES)
116116

@@ -149,9 +149,7 @@ macro(_userver_module_find_part)
149149

150150
if(${mangled_name})
151151
list(APPEND "${variable}" "${${mangled_name}}")
152-
elseif (NOT ARG_OPTIONAL)
153-
message(FATAL_ERROR "Failed to find ${ARG_PART_TYPE} '${ARG_NAMES}'")
154-
endif()
152+
endif()
155153

156154
unset(variable)
157155
unset(names_joined)
@@ -160,21 +158,16 @@ macro(_userver_module_find_part)
160158
endmacro()
161159

162160
macro(_userver_module_find_library)
163-
set(options OPTIONAL)
161+
set(options)
164162
set(oneValueArgs)
165163
set(multiValueArgs NAMES PATHS PATH_SUFFIXES)
166164

167165
cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" "${ARGN}")
168-
set(OPTIONAL_TO_PASS)
169-
if(ARG_OPTIONAL)
170-
set(OPTIONAL_TO_PASS OPTIONAL)
171-
endif()
172166

173167
_userver_module_find_part(
174168
PART_TYPE
175169
library
176-
${OPTIONAL_TO_PASS}
177-
NAMES
170+
NAMES
178171
${ARG_NAMES}
179172
PATHS
180173
${ARG_PATHS}

0 commit comments

Comments
 (0)