Skip to content

Commit feecca6

Browse files
henryiiijcfr
andcommitted
feat: Rename Cython_compile_pyx argument from TARGET_LANGUAGE to LANGUAGE
Co-authored-by: Jean-Christophe Fillion-Robin <[email protected]>
1 parent 81d674c commit feecca6

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

src/cython_cmake/cmake/UseCython.cmake

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
# using cython.
99
#
1010
# Cython_compile_pyx(<pyx_file1> [<pyx_file2> ...]
11-
# [TARGET_LANGUAGE C | CXX]
11+
# [LANGUAGE C | CXX]
1212
# [LANGUAGE_LEVEL 2 | 3 | 3str]
1313
# [OUTPUT_VARIABLE <OutputVariable>])
1414
#
1515
# Options:
1616
#
17-
# ``TARGET_LANGUAGE [C | CXX]``
17+
# ``LANGUAGE [C | CXX]``
1818
# Force the generation of either a C or C++ file. By default, a C file is
1919
# generated, unless the C language is not enabled for the project; in this
2020
# case, a C++ file is generated by default.
@@ -165,10 +165,10 @@ function(add_cython_target _name)
165165
mark_as_advanced(CYTHON_ANNOTATE CYTHON_FLAGS)
166166

167167
if(_args_C)
168-
set(_target_language "C")
168+
set(_language "C")
169169
endif()
170170
if(_args_CXX)
171-
set(_target_language "CXX")
171+
set(_language "CXX")
172172
endif()
173173

174174
if(_args_PY2)
@@ -218,7 +218,7 @@ function(add_cython_target _name)
218218
endif()
219219

220220
Cython_compile_pyx(
221-
TARGET_LANGUAGE ${_target_language}
221+
LANGUAGE ${_language}
222222
LANGUAGE_LEVEL ${_language_level}
223223
CYTHON_ARGS ${_cython_args}
224224
OUTPUT_VARIABLE ${_args_OUTPUT_VAR}
@@ -232,7 +232,7 @@ endfunction()
232232

233233
function(Cython_compile_pyx)
234234
set(_options )
235-
set(_one_value LANGUAGE_LEVEL TARGET_LANGUAGE OUTPUT_VARIABLE)
235+
set(_one_value LANGUAGE_LEVEL LANGUAGE OUTPUT_VARIABLE)
236236
set(_multi_value CYTHON_ARGS)
237237

238238
cmake_parse_arguments(_args
@@ -247,26 +247,26 @@ function(Cython_compile_pyx)
247247

248248
# Set target language
249249
get_property(_languages GLOBAL PROPERTY ENABLED_LANGUAGES)
250-
set(_target_language ${_args_TARGET_LANGUAGE})
251-
if(NOT _target_language)
250+
set(_language ${_args_LANGUAGE})
251+
if(NOT _language)
252252
if("C" IN_LIST _languages)
253-
set(_target_language "C")
253+
set(_language "C")
254254
elseif("CXX" IN_LIST _languages)
255-
set(_target_language "CXX")
255+
set(_language "CXX")
256256
endif()
257257
else()
258-
if(NOT _target_language MATCHES "^(C|CXX)$")
259-
message(FATAL_ERROR "TARGET_LANGUAGE must be one of C or CXX")
258+
if(NOT _language MATCHES "^(C|CXX)$")
259+
message(FATAL_ERROR "LANGUAGE must be one of C or CXX")
260260
endif()
261261
endif()
262262

263-
set(_target_language_C_arg "")
264-
set(_target_language_C_extension "c")
265-
set(_target_language_CXX_arg "--cplus")
266-
set(_target_language_CXX_extension "cxx")
263+
set(_language_C_arg "")
264+
set(_language_C_extension "c")
265+
set(_language_CXX_arg "--cplus")
266+
set(_language_CXX_extension "cxx")
267267

268-
set(_target_language_arg ${_target_language_${_target_language}_arg})
269-
set(_target_language_extension ${_target_language_${_target_language}_extension})
268+
set(_language_arg ${_language_${_language}_arg})
269+
set(_language_extension ${_language_${_language}_extension})
270270

271271
# Set language level
272272
set(_language_level ${_args_LANGUAGE_LEVEL})
@@ -293,13 +293,13 @@ function(Cython_compile_pyx)
293293

294294
foreach(_source_file IN LISTS _source_files)
295295
cmake_path(GET _source_file STEM _name)
296-
set(generated_file "${CMAKE_CURRENT_BINARY_DIR}/${_name}.${_target_language_extension}")
296+
set(generated_file "${CMAKE_CURRENT_BINARY_DIR}/${_name}.${_language_extension}")
297297
set_source_files_properties(${generated_file} PROPERTIES GENERATED TRUE)
298298

299299
file(RELATIVE_PATH generated_file_relative
300300
${CMAKE_BINARY_DIR} ${generated_file})
301301

302-
set(comment "Generating ${_target_language} source ${generated_file_relative}")
302+
set(comment "Generating ${_language} source ${generated_file_relative}")
303303

304304
get_source_file_property(pyx_location ${_source_file} LOCATION)
305305

@@ -308,7 +308,7 @@ function(Cython_compile_pyx)
308308
OUTPUT ${generated_file}
309309
COMMAND ${CYTHON_EXECUTABLE}
310310
ARGS
311-
${_target_language_arg}
311+
${_language_arg}
312312
${_language_level_arg}
313313
${_args_CYTHON_ARGS}
314314
${_depfile_arg}

tests/packages/simple/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ find_package(
77
REQUIRED)
88
find_package(Cython MODULE REQUIRED VERSION 3.0)
99

10-
cython_compile_pyx(simple.pyx TARGET_LANGUAGE C OUTPUT_VARIABLE simple_c)
10+
cython_compile_pyx(simple.pyx LANGUAGE C OUTPUT_VARIABLE simple_c)
1111

1212
python_add_library(simple MODULE "${simple_c}" WITH_SOABI)
1313

0 commit comments

Comments
 (0)