Skip to content
Snippets Groups Projects
Commit 035e6148 authored by Sergey Yakubov's avatar Sergey Yakubov
Browse files

fix paths

parent 4a9de01e
Branches
Tags
No related merge requests found
get_property(ASAPO_WORKER_LIB TARGET asapo-worker PROPERTY LOCATION)
set (ASAPO_WORKER_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../cpp/include)
if (UNIX)
include(CMakeLists_Linux.cmake)
set (suf "so")
......
......@@ -6,6 +6,10 @@ ELSE()
set (EXTRA_LINK_ARGS "['-static-libgcc','-static-libstdc++']")
ENDIF()
get_property(ASAPO_WORKER_LIB TARGET asapo-worker PROPERTY LOCATION)
set (ASAPO_WORKER_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../cpp/include)
configure_files(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} @ONLY)
ADD_CUSTOM_TARGET(python-lib2 ALL
......
......@@ -19,6 +19,9 @@ set(SOURCE_FILES
add_library(${TARGET_NAME} SHARED ${SOURCE_FILES})
set_target_properties(${TARGET_NAME} PROPERTIES SUFFIX ".pyd")
#set_target_properties(${TARGET_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY
# ${CMAKE_CURRENT_BINARY_DIR}$<$<CONFIG:Debug>:>
# )
target_link_libraries(${TARGET_NAME} asapo-worker ${Python3_LIBRARIES})
target_include_directories(${TARGET_NAME} PUBLIC include ${Python3_INCLUDE_DIRS} ${PYTHON_NUMPY_INCLUDE_DIR})
......
......@@ -7,7 +7,7 @@ ADD_CUSTOM_TARGET(windows-bdist ALL
ADD_CUSTOM_TARGET(copy_python_bdist ALL
COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/asapo_worker
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/../asapo_worker.pyd ${CMAKE_CURRENT_BINARY_DIR}/asapo_worker/
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:asapo_worker> ${CMAKE_CURRENT_BINARY_DIR}/asapo_worker/
)
......
......@@ -6,9 +6,7 @@ ADD_CUSTOM_TARGET(python-dist ALL
COMMAND python setup.py sdist
)
get_property(ASAPO_WORKER_LIB TARGET asapo-worker PROPERTY LOCATION)
#get_property(ASAPO_WORKER_LIB TARGET asapo-worker PROPERTY LOCATION)
ADD_CUSTOM_TARGET(copy_python_dist ALL
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/../asapo_wrappers.h ${CMAKE_CURRENT_BINARY_DIR}/.
......@@ -18,7 +16,7 @@ ADD_CUSTOM_TARGET(copy_python_dist ALL
COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_CURRENT_BINARY_DIR}/include/common/version.h.in
COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/lib
COMMAND ${CMAKE_COMMAND} -E copy ${CURL_LIBRARIES} ${CMAKE_CURRENT_BINARY_DIR}/lib
COMMAND ${CMAKE_COMMAND} -E copy ${ASAPO_WORKER_LIB} ${CMAKE_CURRENT_BINARY_DIR}/lib
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:asapo-worker> ${CMAKE_CURRENT_BINARY_DIR}/lib
)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment