Fix error with incorrect installation of python files: <prefix>/lib/python/site-packa...

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4a965e034d00c81fac7ea817c9090020a4a8a026..0f19c91101defa7fd0059f1b92238ead44663f2a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,6 +69,7 @@ IF (LIBBATCH_PYTHON_WRAPPING)
   FIND_PACKAGE(LibbatchPython REQUIRED)
   FIND_PACKAGE(LibbatchSWIG REQUIRED)
   
+  SET(PYTHON_VERSION "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
   SET(LIBBATCH_PYTHONPATH lib/python${PYTHON_VERSION}/site-packages)
 ENDIF()
 

diff --git a/src/Python/CMakeLists.txt b/src/Python/CMakeLists.txt
index a56f5fb088a275490e6ebcdcbd145a7a649b0da1..17e4444b47b5be72a8016b9c6119eb8d09c9c962 100644 (file)
--- a/src/Python/CMakeLists.txt
+++ b/src/Python/CMakeLists.txt
@@ -50,7 +50,6 @@ SET(SWIG_MODULE_libbatch_EXTRA_DEPS ${SWIG_LB_DPYS})
 SWIG_ADD_MODULE(libbatch python ${SWIG_SRC_FILE})
 SWIG_LINK_LIBRARIES(libbatch batch ${PYTHON_LIBRARIES})
 
-SET(PYTHON_VERSION "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
 INSTALL(TARGETS ${SWIG_MODULE_libbatch_REAL_NAME} DESTINATION ${LIBBATCH_PYTHONPATH})
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libbatch.py
         DESTINATION ${LIBBATCH_PYTHONPATH})