File tree Expand file tree Collapse file tree 3 files changed +41
-55
lines changed Expand file tree Collapse file tree 3 files changed +41
-55
lines changed Original file line number Diff line number Diff line change @@ -161,34 +161,28 @@ function(dtrace_target)
161161 message (FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} expects source files." )
162162 endif ()
163163
164- if (NOT IS_ABSOLUTE "${parsed_INPUT} " )
165- cmake_path(
166- ABSOLUTE_PATH
167- parsed_INPUT
168- BASE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
169- NORMALIZE
170- )
171- endif ()
164+ cmake_path(
165+ ABSOLUTE_PATH
166+ parsed_INPUT
167+ BASE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
168+ NORMALIZE
169+ )
172170
173- if (NOT IS_ABSOLUTE "${parsed_HEADER} " )
171+ cmake_path(
172+ ABSOLUTE_PATH
173+ parsed_HEADER
174+ BASE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
175+ NORMALIZE
176+ )
177+
178+ set (sources "" )
179+ foreach (source IN LISTS parsed_SOURCES)
174180 cmake_path(
175181 ABSOLUTE_PATH
176- parsed_HEADER
177- BASE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR }
182+ source
183+ BASE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR }
178184 NORMALIZE
179185 )
180- endif ()
181-
182- set (sources "" )
183- foreach (source IN LISTS parsed_SOURCES)
184- if (NOT IS_ABSOLUTE ${source} )
185- cmake_path(
186- ABSOLUTE_PATH
187- source
188- BASE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
189- NORMALIZE
190- )
191- endif ()
192186 list (APPEND sources ${source} )
193187 endforeach ()
194188 set (parsed_SOURCES ${sources} )
Original file line number Diff line number Diff line change @@ -191,14 +191,12 @@ function(php_configure_file)
191191
192192 if (parsed_INPUT)
193193 set (___phpConfigureFileTemplate "${parsed_INPUT} " )
194- if (NOT IS_ABSOLUTE "${___phpConfigureFileTemplate} " )
195- cmake_path(
196- ABSOLUTE_PATH
197- ___phpConfigureFileTemplate
198- BASE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
199- NORMALIZE
200- )
201- endif ()
194+ cmake_path(
195+ ABSOLUTE_PATH
196+ ___phpConfigureFileTemplate
197+ BASE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
198+ NORMALIZE
199+ )
202200 else ()
203201 cmake_path(GET parsed_OUTPUT FILENAME ___phpConfigureFileTemplate)
204202 set (
@@ -209,14 +207,12 @@ function(php_configure_file)
209207 endif ()
210208
211209 set (___phpConfigureFileOutput "${parsed_OUTPUT} " )
212- if (NOT IS_ABSOLUTE "${___phpConfigureFileOutput} " )
213- cmake_path(
214- ABSOLUTE_PATH
215- ___phpConfigureFileOutput
216- BASE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
217- NORMALIZE
218- )
219- endif ()
210+ cmake_path(
211+ ABSOLUTE_PATH
212+ ___phpConfigureFileOutput
213+ BASE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
214+ NORMALIZE
215+ )
220216
221217 cmake_path(GET ___phpConfigureFileOutput FILENAME filename)
222218 set (
Original file line number Diff line number Diff line change @@ -160,24 +160,20 @@ function(pkgconfig_generate_pc)
160160 endif ()
161161
162162 set (template "${ARGV0} " )
163- if (NOT IS_ABSOLUTE "${template} " )
164- cmake_path(
165- ABSOLUTE_PATH
166- template
167- BASE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
168- NORMALIZE
169- )
170- endif ()
163+ cmake_path(
164+ ABSOLUTE_PATH
165+ template
166+ BASE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
167+ NORMALIZE
168+ )
171169
172170 set (output "${ARGV1} " )
173- if (NOT IS_ABSOLUTE "${output} " )
174- cmake_path(
175- ABSOLUTE_PATH
176- output
177- BASE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
178- NORMALIZE
179- )
180- endif ()
171+ cmake_path(
172+ ABSOLUTE_PATH
173+ output
174+ BASE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
175+ NORMALIZE
176+ )
181177
182178 file (
183179 GENERATE
You can’t perform that action at this time.
0 commit comments