diff --git a/cnoid/project/CMakeLists.txt b/cnoid/project/CMakeLists.txt index 7e75f2b..f8bdfe8 100644 --- a/cnoid/project/CMakeLists.txt +++ b/cnoid/project/CMakeLists.txt @@ -1,3 +1,25 @@ +if(NOT ${CHOREONOID_USE_PYTHON2}) + execute_process( + COMMAND python3 -c "import sysconfig; print(sysconfig.get_config_var(\"VERSION\"))" + OUTPUT_VARIABLE PYTHON_VERSION + RESULT_VARIABLE PYTHON_VERSION_SUCCESS + OUTPUT_STRIP_TRAILING_WHITESPACE) +else() + execute_process( + COMMAND python2 -c "from distutils import sysconfig; print(sysconfig.get_config_var(\"VERSION\"))" + OUTPUT_VARIABLE PYTHON_VERSION + RESULT_VARIABLE PYTHON_VERSION_SUCCESS + OUTPUT_STRIP_TRAILING_WHITESPACE) +endif() +if(NOT PYTHON_VERSION_SUCCESS STREQUAL 0) + execute_process( + COMMAND python -c "from distutils import sysconfig; print(sysconfig.get_config_var(\"VERSION\"))" + OUTPUT_VARIABLE PYTHON_VERSION + RESULT_VARIABLE PYTHON_VERSION_SUCCESS + OUTPUT_STRIP_TRAILING_WHITESPACE) +endif() +message("-- Python version detected: ${PYTHON_VERSION}") + set(LMC_CNOID_CONFIG_FILE_LIST rtc.conf.choreonoid robot.conf diff --git a/cnoid/project/LMC_JVRC1_Cart.in.cnoid b/cnoid/project/LMC_JVRC1_Cart.in.cnoid index 32ba659..3098323 100644 --- a/cnoid/project/LMC_JVRC1_Cart.in.cnoid +++ b/cnoid/project/LMC_JVRC1_Cart.in.cnoid @@ -534,7 +534,7 @@ OpenRTM: "deleteUnmanagedRTCsOnStartingSimulation": true Python: "moduleSearchPath": - - @HRPSYSBASE_PREFIX@/lib/python2.7/dist-packages/hrpsys + - @HRPSYSBASE_PREFIX@/lib/python@PYTHON_VERSION@/dist-packages/hrpsys viewAreas: - type: embedded diff --git a/cnoid/project/LMC_JVRC1_CartHighFriction.in.cnoid b/cnoid/project/LMC_JVRC1_CartHighFriction.in.cnoid index 9ff8fa6..207f0c3 100644 --- a/cnoid/project/LMC_JVRC1_CartHighFriction.in.cnoid +++ b/cnoid/project/LMC_JVRC1_CartHighFriction.in.cnoid @@ -534,7 +534,7 @@ OpenRTM: "deleteUnmanagedRTCsOnStartingSimulation": true Python: "moduleSearchPath": - - @HRPSYSBASE_PREFIX@/lib/python2.7/dist-packages/hrpsys + - @HRPSYSBASE_PREFIX@/lib/python@PYTHON_VERSION@/dist-packages/hrpsys viewAreas: - type: embedded