Skip to content

Commit f40b36b

Browse files
alexmalyshevfacebook-github-bot
authored andcommitted
Support 3.12 and 3.14 Interpreter includes in CMake
Summary: Taking advantage of the new directory layout and the new 3.14/ directory. Reviewed By: mpage Differential Revision: D78571255 fbshipit-source-id: a91b7f332f175d773cefa7112a8a5a68c96c2fba
1 parent 6f7b7a8 commit f40b36b

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -204,14 +204,14 @@ target_link_libraries(cached-properties PRIVATE common borrowed)
204204

205205
set(INTERP_SOURCES ${PROJECT_SOURCE_DIR}/Interpreter/iter_helpers.c)
206206

207-
if (${PY_VERSION} EQUAL 3.12)
208-
set(SOURCE_CINDERX_OPCODE_TARGETS_H ${PROJECT_SOURCE_DIR}/Interpreter/3.12/cinderx_opcode_targets.h)
209-
set(SOURCE_CINDER_OPCODE_H ${PROJECT_SOURCE_DIR}/Interpreter/3.12/cinder_opcode.h)
210-
set(SOURCE_CINDER_OPCODE_IDS_H ${PROJECT_SOURCE_DIR}/Interpreter/3.12/cinder_opcode_ids.h)
211-
set(SOURCE_CINDER_OPCODE_METADATA_H ${PROJECT_SOURCE_DIR}/Interpreter/3.12/cinder_opcode_metadata.h)
207+
if (${PY_VERSION} EQUAL 3.12 OR ${PY_VERSION} EQUAL 3.14)
208+
set(SOURCE_CINDERX_OPCODE_TARGETS_H ${PROJECT_SOURCE_DIR}/Interpreter/${PY_VERSION}/cinderx_opcode_targets.h)
209+
set(SOURCE_CINDER_OPCODE_H ${PROJECT_SOURCE_DIR}/Interpreter/${PY_VERSION}/cinder_opcode.h)
210+
set(SOURCE_CINDER_OPCODE_IDS_H ${PROJECT_SOURCE_DIR}/Interpreter/${PY_VERSION}/cinder_opcode_ids.h)
211+
set(SOURCE_CINDER_OPCODE_METADATA_H ${PROJECT_SOURCE_DIR}/Interpreter/${PY_VERSION}/cinder_opcode_metadata.h)
212212

213213
if (${META_PYTHON})
214-
set(INTERP_SOURCES ${INTERP_SOURCES} ${PROJECT_SOURCE_DIR}/Interpreter/3.12/interpreter.c)
214+
set(INTERP_SOURCES ${INTERP_SOURCES} ${PROJECT_SOURCE_DIR}/Interpreter/${PY_VERSION}/interpreter.c)
215215
endif()
216216
endif()
217217

0 commit comments

Comments
 (0)