From 2c278acfcd2f81b99dd102cdcbcefb86aa73f18b Mon Sep 17 00:00:00 2001 From: Brendan Le Foll Date: Wed, 4 Jun 2014 12:06:04 +0100 Subject: [PATCH] cmake: install python & node.js modules correctly Signed-off-by: Brendan Le Foll --- src/javascript/CMakeLists.txt | 4 ++++ src/javascript/package.json | 2 ++ src/python/CMakeLists.txt | 9 +++++++++ 3 files changed, 15 insertions(+) create mode 100644 src/javascript/package.json diff --git a/src/javascript/CMakeLists.txt b/src/javascript/CMakeLists.txt index c4298cf..a503ad5 100644 --- a/src/javascript/CMakeLists.txt +++ b/src/javascript/CMakeLists.txt @@ -30,3 +30,7 @@ set_target_properties (maajs PROPERTIES PREFIX "" SUFFIX ".node" ) + +install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/package.json + ${CMAKE_CURRENT_BINARY_DIR}/maajs.node + DESTINATION lib/node_modules/maajs) diff --git a/src/javascript/package.json b/src/javascript/package.json new file mode 100644 index 0000000..9a60988 --- /dev/null +++ b/src/javascript/package.json @@ -0,0 +1,2 @@ +{ "name" : "maajs", + "main" : "./maajs.node" } diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt index 37b43f7..f00587a 100644 --- a/src/python/CMakeLists.txt +++ b/src/python/CMakeLists.txt @@ -26,4 +26,13 @@ if (DOXYGEN_FOUND) ) endif () +# Essentially do seperate_arguments but with "." instead of " " +string (REPLACE "." ";" PYTHON_VERSION_LIST ${PYTHONLIBS_VERSION_STRING}) +list (GET PYTHON_VERSION_LIST 0 PYTHON_VERSION_MAJOR) +list (GET PYTHON_VERSION_LIST 1 PYTHON_VERSION_MINOR) + +install (FILES ${CMAKE_CURRENT_BINARY_DIR}/_pymaa.so + ${CMAKE_CURRENT_BINARY_DIR}/pymaa.py + DESTINATION lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/) + add_subdirectory (docs) -- 2.7.4