Skip to content

Commit

Permalink
talipot-python: Simplify cmake script generating properties bindings
Browse files Browse the repository at this point in the history
Use CONFIGURE_FILE command instead of reimplementing it.
  • Loading branch information
anlambert committed May 28, 2024
1 parent 0677918 commit 4e4562a
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 deletions.
4 changes: 3 additions & 1 deletion library/talipot-python/bindings/talipot-core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ ADD_CUSTOM_COMMAND(
DEPENDS
${TALIPOT_SIP_FILES} ${STL_SIP_FILES} pyproject.toml
${CMAKE_CURRENT_SOURCE_DIR}/../../include/talipot/PythonCppTypesConverter.h
${CMAKE_CURRENT_SOURCE_DIR}/generatePropertiesBindings.cmake
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})

DISABLE_COMPILER_WARNINGS()
Expand Down Expand Up @@ -194,6 +195,7 @@ IF(TALIPOT_ACTIVATE_PYTHON_WHEEL_TARGET)

CONFIGURE_FILE(packaging/setup.cfg.in ${TALIPOT_PYTHON_FOLDER}/../setup.cfg)
CONFIGURE_FILE(packaging/setup.py.in ${TALIPOT_PYTHON_FOLDER}/../setup.py)

IF(TALIPOT_GENERATE_TESTPYPI_WHEEL)
SET(TALIPOT_PYTHON_WHEEL_VERSION ${TALIPOT_PYTHON_TEST_WHEEL_VERSION})
CONFIGURE_FILE(packaging/setup.py.in
Expand All @@ -216,6 +218,7 @@ IF(TALIPOT_ACTIVATE_PYTHON_WHEEL_TARGET)
DEPENDS ${TALIPOT_PYTHON_FOLDER}/../setup.py
${TALIPOT_PYTHON_FOLDER}/../setup.cfg)
ADD_DEPENDENCIES(wheel copyTalipotPythonPackagingFiles)

IF(TALIPOT_GENERATE_TESTPYPI_WHEEL)
ADD_DEPENDENCIES(wheel copyTalipotPythonPackagingFiles)
ENDIF(TALIPOT_GENERATE_TESTPYPI_WHEEL)
Expand All @@ -239,7 +242,6 @@ ENDIF(WIN32)
# _talipot.so binary That way, the talipot module can be imported in a classical
# Python shell without having to modify the content of the DYLD_LIBRARY_PATH
# environment variable

FILE(RELATIVE_PATH TalipotLibsInstallRelPath
${TalipotPythonModulesInstallDir}/talipot/native
${CMAKE_INSTALL_PREFIX}/${TalipotLibInstallDir})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,31 +11,29 @@ MACRO(
PYTHON_NODE_TYPEHINT
PYTHON_EDGE_TYPEHINT
PROPERTY_SPECIFIC_METHODS_FILE)
SET(BASE_CLASS "${BASE_CLASS}")
SET(PROPERTY_TYPE "${PROPERTY_TYPE}")
SET(PROPERTY_NODE_TYPE "${CPP_NODE_TYPE}")
SET(PROPERTY_EDGE_TYPE "${CPP_EDGE_TYPE}")

FILE(READ ${SOURCE_DIR}/AbstractProperty.sip.in input)
STRING(REPLACE "@BASE_CLASS@" "${BASE_CLASS}" input "${input}")
STRING(REPLACE "@PROPERTY_TYPE@" "${PROPERTY_TYPE}" input "${input}")
STRING(REPLACE "@PROPERTY_NODE_TYPE@" "${CPP_NODE_TYPE}" input "${input}")
STRING(REPLACE "@PROPERTY_EDGE_TYPE@" "${CPP_EDGE_TYPE}" input "${input}")
STRING(REPLACE "@PYTHON_NODE_TYPE@" "${PYTHON_NODE_TYPE}" input "${input}")
STRING(REPLACE "@PYTHON_EDGE_TYPE@" "${PYTHON_EDGE_TYPE}" input "${input}")
STRING(REPLACE "@VEC_PROPERTY_TYPE@" "${VEC_PROPERTY_TYPE}" input "${input}")
STRING(REPLACE "@CPP_TYPE@" "${CPP_NODE_TYPE}" input "${input}")
STRING(REPLACE "@PYTHON_TYPE@" "${PYTHON_NODE_TYPE}" input "${input}")
STRING(REPLACE "@PYTHON_NODE_TYPEHINT@" "${PYTHON_NODE_TYPEHINT}" input
"${input}")
STRING(REPLACE "@PYTHON_EDGE_TYPEHINT@" "${PYTHON_EDGE_TYPEHINT}" input
"${input}")
SET(PYTHON_NODE_TYPE "${PYTHON_NODE_TYPE}")
SET(PYTHON_EDGE_TYPE "${PYTHON_EDGE_TYPE}")
SET(VEC_PROPERTY_TYPE "${VEC_PROPERTY_TYPE}")
SET(CPP_TYPE "${CPP_NODE_TYPE}")
SET(PYTHON_TYPE "${PYTHON_NODE_TYPE}")

SET(PYTHON_NODE_TYPEHINT "${PYTHON_NODE_TYPEHINT}")
SET(PYTHON_EDGE_TYPEHINT "${PYTHON_EDGE_TYPEHINT}")

IF(NOT "${PROPERTY_SPECIFIC_METHODS_FILE}" STREQUAL "")
FILE(READ ${SOURCE_DIR}/${PROPERTY_SPECIFIC_METHODS_FILE} specific)
STRING(REPLACE "@PROPERTY_SPECIFIC_METHODS@" "${specific}" input "${input}")
SET(PROPERTY_SPECIFIC_METHODS "${specific}")
ELSE()
STRING(REPLACE "@PROPERTY_SPECIFIC_METHODS@" "" input "${input}")
SET(PROPERTY_SPECIFIC_METHODS "")
ENDIF()

FILE(WRITE ${SOURCE_DIR}/${GEN_FILE} "${input}")

CONFIGURE_FILE(${SOURCE_DIR}/AbstractProperty.sip.in
${SOURCE_DIR}/${GEN_FILE})
ENDMACRO(GEN_PROPERTY_BINDINGS)

GEN_PROPERTY_BINDINGS(
Expand Down

0 comments on commit 4e4562a

Please sign in to comment.