From 45218c42a89319c6adca984ec127f0e3089cf5b9 Mon Sep 17 00:00:00 2001 From: tedjk Date: Wed, 13 May 2015 14:18:28 +0200 Subject: [PATCH] moved python module to /lib and executable to /bin, updated plugins.py --- juci/CMakeLists.txt | 7 +++++-- juci/plugins.py | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/juci/CMakeLists.txt b/juci/CMakeLists.txt index 64c2849..5cd0026 100644 --- a/juci/CMakeLists.txt +++ b/juci/CMakeLists.txt @@ -111,6 +111,9 @@ add_executable(${project_name} terminal.cc ) +set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) + + add_library(${module} SHARED api api_ext @@ -132,8 +135,8 @@ link_directories( ${LIBCLANG_LIBRARY_DIRS} ) #module: -set_target_properties(${module} PROPERTIES PREFIX "") -# LIBRARY_OUTPUT_DIRECTORY "/usr/lib/python2.7/dist-packages/") +set_target_properties(${module} PROPERTIES PREFIX "" +LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/lib/") target_link_libraries(${module} ${PYTHON_LIBRARIES} ${Boost_LIBRARIES}) #executable: target_link_libraries(${project_name} ${LIVCLANG_LIBRARIES} ${LCL_LIBRARIES} ${GTKMM_LIBRARIES} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES}) diff --git a/juci/plugins.py b/juci/plugins.py index f8faf6e..ef50bb7 100644 --- a/juci/plugins.py +++ b/juci/plugins.py @@ -2,7 +2,7 @@ #plugin handler import sys, os, glob cwd = os.getcwd() -sys.path.append(cwd) +sys.path.append(cwd+"/lib") import juci_to_python_api as juci def loadplugins():