diff --git a/.gitignore b/.gitignore index 33286c8dfc188394b5b5c4a8aa91a117fd2603fc..b2e37249f944721e9eb318a7e6573edbfdce7121 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ matlab *dat release +python/portability.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 6fcbafe7bd1f6d318e94dc382c50c0da7bcfe9d5..d1877f1a33b4517def4d286cd0ff7d5a96ef51c1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -136,5 +136,11 @@ endforeach(lib) ADD_SUBDIRECTORY(src) ADD_SUBDIRECTORY(unitTesting) +# Configure some of the python files +CONFIGURE_FILE( + "${CMAKE_CURRENT_SOURCE_DIR}/python/robotSpecific.py.cmake" + "${CMAKE_CURRENT_SOURCE_DIR}/python/robotSpecific.py" +) + SETUP_PROJECT_FINALIZE() -SETUP_PROJECT_CPACK() \ No newline at end of file +SETUP_PROJECT_CPACK() diff --git a/python/robotSpecific.py b/python/robotSpecific.py.cmake similarity index 95% rename from python/robotSpecific.py rename to python/robotSpecific.py.cmake index e8231cb2c63f51a4367939bc7a26b306e092f0f3..92d0f69779d615a6819316ad4e4f246cac296f92 100644 --- a/python/robotSpecific.py +++ b/python/robotSpecific.py.cmake @@ -13,10 +13,10 @@ specificitiesName=dict() jointRankName=dict() postureRange=dict() -pkgDataRootDir['hrp10small'] = "/home/nmansard/compil/poulou/hpp2/share/hrp2-10-small" -pkgDataRootDir['hrp14small'] = "/home/nmansard/compil/poulou/hpp2/share/hrp2-14" -pkgDataRootDir['hrp14aug'] = "/home/nmansard/compil/poulou/hpp2/share/hrp2-14-augmented" -pkgDataRootDir['hrp10aug'] = "/home/nmansard/compil/poulou/hpp2/share/hrp2-10-augmented" +pkgDataRootDir['hrp10small'] = "@CMAKE_INSTALL_PREFIX@/share/hrp2-10-small" +pkgDataRootDir['hrp14small'] = "@CMAKE_INSTALL_PREFIX@/share/hrp2-14" +pkgDataRootDir['hrp14aug'] = "@CMAKE_INSTALL_PREFIX@/hrp2-14-augmented" +pkgDataRootDir['hrp10aug'] = "@CMAKE_INSTALL_PREFIX@/share/hrp2-10-augmented" modelName['hrp10small'] = 'HRP2JRLmainsmall.wrl' modelName['hrp14small'] = 'HRP2JRLmainsmall.wrl' @@ -84,7 +84,7 @@ gearRatio['hrp10aug'] = (0,0,0,0,0,0,384.0,240.0,180.0,200.0,180.0,100.0,384.0,2 # --- ROMEO ----------------------------------- -pkgDataRootDir['romeo'] = "/home/nmansard/compil/poulou/hpp2/share/romeo_hands" +pkgDataRootDir['romeo'] = "@CMAKE_INSTALL_PREFIX@/share/romeo_hands" # Romeo data modelName['romeo'] = 'RomeoNoToes.wrl'