From fe2169650e305f30f826f17c58708448b259f2b1 Mon Sep 17 00:00:00 2001 From: Tannin Date: Mon, 16 Nov 2015 21:39:53 +0100 Subject: [PATCH] updated build scripts --- CMakeLists.txt | 9 +++++++-- src/proxy/CMakeLists.txt | 4 ++-- src/runner/CMakeLists.txt | 6 ++++-- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c6b6332..58f0885 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,8 +21,13 @@ GET_FILENAME_COMPONENT(SIP_ROOT ${SIP_ROOT} DIRECTORY) # need to install python -INSTALL(FILES ${PYTHON_ROOT}/PCbuild/python27.dll DESTINATION bin) -INSTALL(FILES ${PYTHON_ROOT}/PCbuild/python27.pdb DESTINATION pdb) +IF(EXISTS "${PYTHON_ROOT}/PCbuild/python27.dll") + INSTALL(FILES ${PYTHON_ROOT}/PCbuild/python27.dll DESTINATION bin) + INSTALL(FILES ${PYTHON_ROOT}/PCbuild/python27.pdb DESTINATION pdb) +ELSEIF(EXISTS "${PYTHON_ROOT}/PCbuild/python27.dll") + INSTALL(FILES ${PYTHON_ROOT}/PCbuild/amd64/python27.dll DESTINATION bin) + INSTALL(FILES ${PYTHON_ROOT}/PCbuild/amd64/python27.pdb DESTINATION pdb) +ENDIF() ADD_SUBDIRECTORY(src/runner) diff --git a/src/proxy/CMakeLists.txt b/src/proxy/CMakeLists.txt index bd085d4..3dd8519 100644 --- a/src/proxy/CMakeLists.txt +++ b/src/proxy/CMakeLists.txt @@ -26,12 +26,12 @@ SET(default_project_path "${CMAKE_SOURCE_DIR}/../..") GET_FILENAME_COMPONENT(${default_project_path} ${default_project_path} REALPATH) SET(project_path "${default_project_path}" CACHE PATH "path to the other mo projects") -SET(lib_path "${project_path}/../install/libs") +SET(lib_path "${project_path}/../../install/libs") ADD_DEFINITIONS(-DUNICODE -D_UNICODE) INCLUDE_DIRECTORIES(${project_path}/uibase/src - ${project_path}/plugin/plugin_python/src/runner/ + ${project_path}/plugin_python/src/runner/ ${PYTHON_ROOT}/Include ${PYTHON_ROOT}/PC) LINK_DIRECTORIES(${lib_path}) diff --git a/src/runner/CMakeLists.txt b/src/runner/CMakeLists.txt index 3f06cc4..1000cbe 100644 --- a/src/runner/CMakeLists.txt +++ b/src/runner/CMakeLists.txt @@ -25,11 +25,13 @@ IF (Boost_FOUND) INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS}) ENDIF (Boost_FOUND) -SET(default_project_path "${CMAKE_SOURCE_DIR}/../..") +SET(default_project_path "${CMAKE_SOURCE_DIR}/..") GET_FILENAME_COMPONENT(${default_project_path} ${default_project_path} REALPATH) SET(project_path "${default_project_path}" CACHE PATH "path to the other mo projects") -SET(lib_path "${project_path}/../install/libs") +SET(lib_path "${project_path}/../../install/libs") + +MESSAGE(STATUS "${Boost_LIBRARY_DIRS}") INCLUDE_DIRECTORIES(${project_path}/uibase/src ${PYTHON_ROOT}/Include