160 lines
7.9 KiB
Diff
160 lines
7.9 KiB
Diff
diff -Naur chrono-9.0.1.orig/src/chrono_swig/chrono_python/CMakeLists.txt chrono-9.0.1/src/chrono_swig/chrono_python/CMakeLists.txt
|
|
--- chrono-9.0.1.orig/src/chrono_swig/chrono_python/CMakeLists.txt 2024-11-10 00:13:56.155386800 +0300
|
|
+++ chrono-9.0.1/src/chrono_swig/chrono_python/CMakeLists.txt 2024-11-10 00:18:07.348272800 +0300
|
|
@@ -100,9 +100,9 @@
|
|
|
|
# The generated .cxx wrapper can be so huge that the /bigobj flag is required in VC++
|
|
if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
|
|
- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /bigobj")
|
|
- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /bigobj")
|
|
- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /bigobj")
|
|
+ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wa,-mbig-obj")
|
|
+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wa,-mbig-obj")
|
|
+ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -Wa,-mbig-obj")
|
|
endif()
|
|
|
|
# Set location of SWIG-generated files.
|
|
@@ -249,9 +249,9 @@
|
|
|
|
# Install .pyd binary module (.so on linux)
|
|
install(TARGETS ${SWIG_MODULE_${CHPY_CORE}_REAL_NAME}
|
|
- RUNTIME DESTINATION "${CH_INSTALL_PYTHON}"
|
|
- LIBRARY DESTINATION "${CH_INSTALL_PYTHON}"
|
|
- ARCHIVE DESTINATION "${CH_INSTALL_PYTHON}")
|
|
+ RUNTIME DESTINATION "${CH_INSTALL_PYTHON}/${CHPY_PACKAGENAME}"
|
|
+ LIBRARY DESTINATION "${CH_INSTALL_PYTHON}/${CHPY_PACKAGENAME}"
|
|
+ ARCHIVE DESTINATION "${CH_INSTALL_PYTHON}/${CHPY_PACKAGENAME}")
|
|
|
|
# Install .py module wrapper
|
|
install(FILES "${CHPY_CORE_PY_FILE}" DESTINATION "${CH_INSTALL_PYTHON}/${CHPY_PACKAGENAME}")
|
|
@@ -335,9 +335,9 @@
|
|
|
|
# Install .pyd binary module (.so on linux)
|
|
install(TARGETS ${SWIG_MODULE_${CHPY_POSTPROCESS}_REAL_NAME}
|
|
- RUNTIME DESTINATION "${CH_INSTALL_PYTHON}"
|
|
- LIBRARY DESTINATION "${CH_INSTALL_PYTHON}"
|
|
- ARCHIVE DESTINATION "${CH_INSTALL_PYTHON}")
|
|
+ RUNTIME DESTINATION "${CH_INSTALL_PYTHON}/${CHPY_PACKAGENAME}"
|
|
+ LIBRARY DESTINATION "${CH_INSTALL_PYTHON}/${CHPY_PACKAGENAME}"
|
|
+ ARCHIVE DESTINATION "${CH_INSTALL_PYTHON}/${CHPY_PACKAGENAME}")
|
|
# Install .py module wrapper
|
|
install(FILES "${CHPY_POSTPROCESS_PY_FILE}" DESTINATION "${CH_INSTALL_PYTHON}/${CHPY_PACKAGENAME}")
|
|
|
|
@@ -403,9 +403,9 @@
|
|
|
|
# Install .pyd binary module (.so on linux)
|
|
install(TARGETS ${SWIG_MODULE_${CHPY_FEA}_REAL_NAME}
|
|
- RUNTIME DESTINATION "${CH_INSTALL_PYTHON}"
|
|
- LIBRARY DESTINATION "${CH_INSTALL_PYTHON}"
|
|
- ARCHIVE DESTINATION "${CH_INSTALL_PYTHON}")
|
|
+ RUNTIME DESTINATION "${CH_INSTALL_PYTHON}/${CHPY_PACKAGENAME}"
|
|
+ LIBRARY DESTINATION "${CH_INSTALL_PYTHON}/${CHPY_PACKAGENAME}"
|
|
+ ARCHIVE DESTINATION "${CH_INSTALL_PYTHON}/${CHPY_PACKAGENAME}")
|
|
# Install .py module wrapper
|
|
install(FILES "${CHPY_FEA_PY_FILE}" DESTINATION "${CH_INSTALL_PYTHON}/${CHPY_PACKAGENAME}")
|
|
|
|
@@ -473,9 +473,9 @@
|
|
|
|
# Install .pyd binary module (.so on linux)
|
|
install(TARGETS ${SWIG_MODULE_${CHPY_IRRLICHT}_REAL_NAME}
|
|
- RUNTIME DESTINATION "${CH_INSTALL_PYTHON}"
|
|
- LIBRARY DESTINATION "${CH_INSTALL_PYTHON}"
|
|
- ARCHIVE DESTINATION "${CH_INSTALL_PYTHON}")
|
|
+ RUNTIME DESTINATION "${CH_INSTALL_PYTHON}/${CHPY_PACKAGENAME}"
|
|
+ LIBRARY DESTINATION "${CH_INSTALL_PYTHON}/${CHPY_PACKAGENAME}"
|
|
+ ARCHIVE DESTINATION "${CH_INSTALL_PYTHON}/${CHPY_PACKAGENAME}")
|
|
# Install .py module wrapper
|
|
install(FILES "${CHPY_IRRLICHT_PY_FILE}" DESTINATION "${CH_INSTALL_PYTHON}/${CHPY_PACKAGENAME}")
|
|
|
|
@@ -547,9 +547,9 @@
|
|
|
|
# Install .pyd binary module (.so on linux)
|
|
install(TARGETS ${SWIG_MODULE_${CHPY_MKL}_REAL_NAME}
|
|
- RUNTIME DESTINATION "${CH_INSTALL_PYTHON}"
|
|
- LIBRARY DESTINATION "${CH_INSTALL_PYTHON}"
|
|
- ARCHIVE DESTINATION "${CH_INSTALL_PYTHON}")
|
|
+ RUNTIME DESTINATION "${CH_INSTALL_PYTHON}/${CHPY_PACKAGENAME}"
|
|
+ LIBRARY DESTINATION "${CH_INSTALL_PYTHON}/${CHPY_PACKAGENAME}"
|
|
+ ARCHIVE DESTINATION "${CH_INSTALL_PYTHON}/${CHPY_PACKAGENAME}")
|
|
# Install .py module wrapper
|
|
install(FILES "${CHPY_MKL_PY_FILE}" DESTINATION "${CH_INSTALL_PYTHON}/${CHPY_PACKAGENAME}")
|
|
|
|
@@ -629,9 +629,9 @@
|
|
|
|
# Install .pyd binary module (.so on linux)
|
|
install(TARGETS ${SWIG_MODULE_${CHPY_CASCADE}_REAL_NAME}
|
|
- RUNTIME DESTINATION "${CH_INSTALL_PYTHON}"
|
|
- LIBRARY DESTINATION "${CH_INSTALL_PYTHON}"
|
|
- ARCHIVE DESTINATION "${CH_INSTALL_PYTHON}")
|
|
+ RUNTIME DESTINATION "${CH_INSTALL_PYTHON}/${CHPY_PACKAGENAME}"
|
|
+ LIBRARY DESTINATION "${CH_INSTALL_PYTHON}/${CHPY_PACKAGENAME}"
|
|
+ ARCHIVE DESTINATION "${CH_INSTALL_PYTHON}/${CHPY_PACKAGENAME}")
|
|
# Install .py module wrapper
|
|
install(FILES "${CHPY_CASCADE_PY_FILE}" DESTINATION "${CH_INSTALL_PYTHON}/${CHPY_PACKAGENAME}")
|
|
|
|
@@ -724,9 +724,9 @@
|
|
|
|
# Install .pyd binary module (.so on linux)
|
|
install(TARGETS ${SWIG_MODULE_${CHPY_VEHICLE}_REAL_NAME}
|
|
- RUNTIME DESTINATION "${CH_INSTALL_PYTHON}"
|
|
- LIBRARY DESTINATION "${CH_INSTALL_PYTHON}"
|
|
- ARCHIVE DESTINATION "${CH_INSTALL_PYTHON}")
|
|
+ RUNTIME DESTINATION "${CH_INSTALL_PYTHON}/${CHPY_PACKAGENAME}"
|
|
+ LIBRARY DESTINATION "${CH_INSTALL_PYTHON}/${CHPY_PACKAGENAME}"
|
|
+ ARCHIVE DESTINATION "${CH_INSTALL_PYTHON}/${CHPY_PACKAGENAME}")
|
|
# Install .py module wrapper
|
|
install(FILES "${CHPY_VEHICLE_PY_FILE}" DESTINATION "${CH_INSTALL_PYTHON}/${CHPY_PACKAGENAME}")
|
|
|
|
@@ -806,9 +806,9 @@
|
|
|
|
# Install .pyd binary module (.so on linux)
|
|
install(TARGETS ${SWIG_MODULE_${CHPY_SENSOR}_REAL_NAME}
|
|
- RUNTIME DESTINATION "${CH_INSTALL_PYTHON}"
|
|
- LIBRARY DESTINATION "${CH_INSTALL_PYTHON}"
|
|
- ARCHIVE DESTINATION "${CH_INSTALL_PYTHON}")
|
|
+ RUNTIME DESTINATION "${CH_INSTALL_PYTHON}/${CHPY_PACKAGENAME}"
|
|
+ LIBRARY DESTINATION "${CH_INSTALL_PYTHON}/${CHPY_PACKAGENAME}"
|
|
+ ARCHIVE DESTINATION "${CH_INSTALL_PYTHON}/${CHPY_PACKAGENAME}")
|
|
# Install .py module wrapper
|
|
install(FILES "${CHPY_SENSOR_PY_FILE}" DESTINATION "${CH_INSTALL_PYTHON}/${CHPY_PACKAGENAME}")
|
|
|
|
@@ -885,9 +885,9 @@
|
|
|
|
# Install .pyd binary module (.so on linux)
|
|
install(TARGETS ${SWIG_MODULE_${CHPY_RS}_REAL_NAME}
|
|
- RUNTIME DESTINATION "${CH_INSTALL_PYTHON}"
|
|
- LIBRARY DESTINATION "${CH_INSTALL_PYTHON}"
|
|
- ARCHIVE DESTINATION "${CH_INSTALL_PYTHON}")
|
|
+ RUNTIME DESTINATION "${CH_INSTALL_PYTHON}/${CHPY_PACKAGENAME}"
|
|
+ LIBRARY DESTINATION "${CH_INSTALL_PYTHON}/${CHPY_PACKAGENAME}"
|
|
+ ARCHIVE DESTINATION "${CH_INSTALL_PYTHON}/${CHPY_PACKAGENAME}")
|
|
# Install .py module wrapper
|
|
install(FILES "${CHPY_VEHICLE_PY_FILE}" DESTINATION "${CH_INSTALL_PYTHON}/${CHPY_PACKAGENAME}")
|
|
|
|
@@ -953,9 +953,9 @@
|
|
|
|
# Install .pyd binary module (.so on linux)
|
|
install(TARGETS ${SWIG_MODULE_${CHPY_PARSERS}_REAL_NAME}
|
|
- RUNTIME DESTINATION "${CH_INSTALL_PYTHON}"
|
|
- LIBRARY DESTINATION "${CH_INSTALL_PYTHON}"
|
|
- ARCHIVE DESTINATION "${CH_INSTALL_PYTHON}")
|
|
+ RUNTIME DESTINATION "${CH_INSTALL_PYTHON}/${CHPY_PACKAGENAME}"
|
|
+ LIBRARY DESTINATION "${CH_INSTALL_PYTHON}/${CHPY_PACKAGENAME}"
|
|
+ ARCHIVE DESTINATION "${CH_INSTALL_PYTHON}/${CHPY_PACKAGENAME}")
|
|
# Install .py module wrapper
|
|
install(FILES "${CHPY_PARSERS_PY_FILE}" DESTINATION "${CH_INSTALL_PYTHON}/${CHPY_PACKAGENAME}")
|
|
|
|
@@ -1047,9 +1047,9 @@
|
|
|
|
# Install .pyd binary module (.so on linux)
|
|
install(TARGETS ${SWIG_MODULE_${CHPY_ROS}_REAL_NAME}
|
|
- RUNTIME DESTINATION "${CH_INSTALL_PYTHON}"
|
|
- LIBRARY DESTINATION "${CH_INSTALL_PYTHON}"
|
|
- ARCHIVE DESTINATION "${CH_INSTALL_PYTHON}")
|
|
+ RUNTIME DESTINATION "${CH_INSTALL_PYTHON}/${CHPY_PACKAGENAME}"
|
|
+ LIBRARY DESTINATION "${CH_INSTALL_PYTHON}/${CHPY_PACKAGENAME}"
|
|
+ ARCHIVE DESTINATION "${CH_INSTALL_PYTHON}/${CHPY_PACKAGENAME}")
|
|
# Install .py module wrapper
|
|
install(FILES "${CHPY_ROS_PY_FILE}" DESTINATION "${CH_INSTALL_PYTHON}/${CHPY_PACKAGENAME}")
|
|
|