Merge branch 'main' into azeey/ci_harmonic

gazebosim · Jul 20, 2023 · 595263b · 595263b
2 parents 7fbcc1c + 572f59b
commit 595263b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -100,6 +100,17 @@ gz_find_package(TINYXML2 REQUIRED PRIVATE PRETTY tinyxml2)
 # Find Python
 find_package(Python3 REQUIRED COMPONENTS Interpreter)
 
+if(USE_SYSTEM_PATHS_FOR_PYTHON_INSTALLATION)
+ if(USE_DIST_PACKAGES_FOR_PYTHON)
+ string(REPLACE "site-packages" "dist-packages" GZ_PYTHON_INSTALL_PATH ${Python3_SITELIB})
+ else()
+ # Python3_SITELIB might use dist-packages in some platforms
+ string(REPLACE "dist-packages" "site-packages" GZ_PYTHON_INSTALL_PATH ${Python3_SITELIB})
+ endif()
+else()
+ # If not a system installation, respect local paths
+ set(GZ_PYTHON_INSTALL_PATH ${GZ_LIB_INSTALL_DIR}/python)
+endif()
 #============================================================================
 # Configure the build
 #============================================================================

diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
@@ -5,7 +5,7 @@
 set(python_init_file ${PROJECT_BINARY_DIR}/python/gz/${GS_DESIGNATION}/__init__.py_configured)
 configure_file(${PROJECT_SOURCE_DIR}/python/src/__init__.py.in ${python_init_file})
 
-install(FILES ${python_init_file} DESTINATION ${CMAKE_INSTALL_PREFIX}/${GZ_LIB_INSTALL_DIR}/python/gz/${GZ_DESIGNATION}${PROJECT_VERSION_MAJOR} RENAME __init__.py)
+install(FILES ${python_init_file} DESTINATION ${GZ_PYTHON_INSTALL_PATH}/gz/${GZ_DESIGNATION}${PROJECT_VERSION_MAJOR} RENAME __init__.py)
 
 if (BUILD_TESTING AND NOT WIN32)
  set(python_tests

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -194,17 +194,6 @@ endif()
 set_source_files_properties(${gen_headers} ${gen_ign_headers} ${gen_detail_headers} ${gen_sources} ${gen_python_scripts}
  PROPERTIES GENERATED TRUE)
 
-if(USE_SYSTEM_PATHS_FOR_PYTHON_INSTALLATION)
- if(USE_DIST_PACKAGES_FOR_PYTHON)
- string(REPLACE "site-packages" "dist-packages" GZ_PYTHON_INSTALL_PATH ${Python3_SITELIB})
- else()
- # Python3_SITELIB might use dist-packages in some platforms
- string(REPLACE "dist-packages" "site-packages" GZ_PYTHON_INSTALL_PATH ${Python3_SITELIB})
- endif()
-else()
- # If not a system installation, respect local paths
- set(GZ_PYTHON_INSTALL_PATH ${GZ_LIB_INSTALL_DIR}/python)
-endif()
 message(STATUS "Installing Python messages to ${GZ_PYTHON_INSTALL_PATH}/gz/${GZ_DESIGNATION}${PROJECT_VERSION_MAJOR}")
 install(FILES ${gen_python_scripts} DESTINATION ${GZ_PYTHON_INSTALL_PATH}/gz/${GZ_DESIGNATION}${PROJECT_VERSION_MAJOR})