remove extra whitespaces
parent
e0ce34833a
commit
5c75a52fa6
|
@ -8,7 +8,7 @@ endif()
|
||||||
# Generate setup.py.
|
# Generate setup.py.
|
||||||
file(READ "${PROJECT_SOURCE_DIR}/README.md" README_CONTENTS)
|
file(READ "${PROJECT_SOURCE_DIR}/README.md" README_CONTENTS)
|
||||||
configure_file(${PROJECT_PYTHON_SOURCE_DIR}/setup.py.in
|
configure_file(${PROJECT_PYTHON_SOURCE_DIR}/setup.py.in
|
||||||
${GTSAM_PYTHON_BUILD_DIRECTORY}/setup.py)
|
${GTSAM_PYTHON_BUILD_DIRECTORY}/setup.py)
|
||||||
|
|
||||||
# Supply MANIFEST.in for older versions of Python
|
# Supply MANIFEST.in for older versions of Python
|
||||||
file(COPY ${PROJECT_PYTHON_SOURCE_DIR}/MANIFEST.in
|
file(COPY ${PROJECT_PYTHON_SOURCE_DIR}/MANIFEST.in
|
||||||
|
@ -23,10 +23,9 @@ include(PybindWrap)
|
||||||
|
|
||||||
# Load the pybind11 code
|
# Load the pybind11 code
|
||||||
|
|
||||||
|
|
||||||
# This is required to avoid an error in modern pybind11 cmake scripts:
|
# This is required to avoid an error in modern pybind11 cmake scripts:
|
||||||
if(POLICY CMP0057)
|
if(POLICY CMP0057)
|
||||||
cmake_policy(SET CMP0057 NEW)
|
cmake_policy(SET CMP0057 NEW)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Use bundled pybind11 version
|
# Use bundled pybind11 version
|
||||||
|
@ -129,14 +128,14 @@ if(WIN32)
|
||||||
ADD_CUSTOM_COMMAND(TARGET ${GTSAM_PYTHON_TARGET} POST_BUILD
|
ADD_CUSTOM_COMMAND(TARGET ${GTSAM_PYTHON_TARGET} POST_BUILD
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
||||||
"${GTSAM_PYTHON_BUILD_DIRECTORY}/gtsam/${GTSAM_OUTPUT_NAME}.pyd"
|
"${GTSAM_PYTHON_BUILD_DIRECTORY}/gtsam/${GTSAM_OUTPUT_NAME}.pyd"
|
||||||
"${GTSAM_PYTHON_BUILD_DIRECTORY}/gtsam/gtsam.pyd"
|
"${GTSAM_PYTHON_BUILD_DIRECTORY}/gtsam/gtsam.pyd"
|
||||||
)
|
)
|
||||||
ADD_CUSTOM_COMMAND(TARGET ${GTSAM_PYTHON_TARGET} POST_BUILD
|
ADD_CUSTOM_COMMAND(TARGET ${GTSAM_PYTHON_TARGET} POST_BUILD
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
||||||
"$<TARGET_FILE:gtsam>;$<TARGET_RUNTIME_DLLS:gtsam>"
|
"$<TARGET_FILE:gtsam>;$<TARGET_RUNTIME_DLLS:gtsam>"
|
||||||
"${GTSAM_PYTHON_BUILD_DIRECTORY}/gtsam/"
|
"${GTSAM_PYTHON_BUILD_DIRECTORY}/gtsam/"
|
||||||
COMMAND_EXPAND_LISTS
|
COMMAND_EXPAND_LISTS
|
||||||
VERBATIM
|
VERBATIM
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
@ -200,7 +199,6 @@ if(GTSAM_UNSTABLE_BUILD_PYTHON)
|
||||||
gtsam::gtsfm::KeypointsVector
|
gtsam::gtsfm::KeypointsVector
|
||||||
gtsam::gtsfm::SfmTrack2dVector)
|
gtsam::gtsfm::SfmTrack2dVector)
|
||||||
|
|
||||||
|
|
||||||
pybind_wrap(${GTSAM_PYTHON_UNSTABLE_TARGET} # target
|
pybind_wrap(${GTSAM_PYTHON_UNSTABLE_TARGET} # target
|
||||||
${PROJECT_SOURCE_DIR}/gtsam_unstable/gtsam_unstable.i # interface_header
|
${PROJECT_SOURCE_DIR}/gtsam_unstable/gtsam_unstable.i # interface_header
|
||||||
"gtsam_unstable.cpp" # generated_cpp
|
"gtsam_unstable.cpp" # generated_cpp
|
||||||
|
@ -228,7 +226,7 @@ if(GTSAM_UNSTABLE_BUILD_PYTHON)
|
||||||
|
|
||||||
# Copy all python files to build folder.
|
# Copy all python files to build folder.
|
||||||
copy_directory("${CMAKE_CURRENT_SOURCE_DIR}/gtsam_unstable"
|
copy_directory("${CMAKE_CURRENT_SOURCE_DIR}/gtsam_unstable"
|
||||||
"${GTSAM_UNSTABLE_MODULE_PATH}")
|
"${GTSAM_UNSTABLE_MODULE_PATH}")
|
||||||
|
|
||||||
# Hack to get python test files copied every time they are modified
|
# Hack to get python test files copied every time they are modified
|
||||||
file(GLOB GTSAM_UNSTABLE_PYTHON_TEST_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/gtsam_unstable/" "${CMAKE_CURRENT_SOURCE_DIR}/gtsam_unstable/tests/*.py")
|
file(GLOB GTSAM_UNSTABLE_PYTHON_TEST_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/gtsam_unstable/" "${CMAKE_CURRENT_SOURCE_DIR}/gtsam_unstable/tests/*.py")
|
||||||
|
@ -241,7 +239,7 @@ if(GTSAM_UNSTABLE_BUILD_PYTHON)
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
set_target_properties(${GTSAM_PYTHON_UNSTABLE_TARGET} PROPERTIES
|
set_target_properties(${GTSAM_PYTHON_UNSTABLE_TARGET} PROPERTIES
|
||||||
SUFFIX ".pyd"
|
SUFFIX ".pyd"
|
||||||
)
|
)
|
||||||
ADD_CUSTOM_COMMAND(TARGET ${GTSAM_PYTHON_UNSTABLE_TARGET} POST_BUILD
|
ADD_CUSTOM_COMMAND(TARGET ${GTSAM_PYTHON_UNSTABLE_TARGET} POST_BUILD
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
||||||
"${GTSAM_PYTHON_BUILD_DIRECTORY}/gtsam_unstable/${GTSAM_UNSTABLE_OUTPUT_NAME}.pyd"
|
"${GTSAM_PYTHON_BUILD_DIRECTORY}/gtsam_unstable/${GTSAM_UNSTABLE_OUTPUT_NAME}.pyd"
|
||||||
|
@ -252,7 +250,7 @@ if(GTSAM_UNSTABLE_BUILD_PYTHON)
|
||||||
"$<TARGET_FILE:gtsam_unstable>;$<TARGET_RUNTIME_DLLS:gtsam_unstable>"
|
"$<TARGET_FILE:gtsam_unstable>;$<TARGET_RUNTIME_DLLS:gtsam_unstable>"
|
||||||
"${GTSAM_PYTHON_BUILD_DIRECTORY}/gtsam_unstable/"
|
"${GTSAM_PYTHON_BUILD_DIRECTORY}/gtsam_unstable/"
|
||||||
COMMAND_EXPAND_LISTS
|
COMMAND_EXPAND_LISTS
|
||||||
VERBATIM
|
VERBATIM
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue