From fe38024ff07e1a386cf0cb29104e3c245a84c791 Mon Sep 17 00:00:00 2001 From: vsr Date: Wed, 31 Jul 2013 12:50:13 +0000 Subject: [PATCH] Fix error with incorrect installation of python files: /lib/python/site-packages -> /lib/python/site-packages --- CMakeLists.txt | 1 + src/Python/CMakeLists.txt | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4a965e0..0f19c91 100644 --- 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 a56f5fb..17e4444 100644 --- 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}) -- 2.30.2