Skip to content
Snippets Groups Projects
Commit 2a0e15d6 authored by Mark Winter's avatar Mark Winter
Browse files

Move Python files to appropriate src directory after build

parent 9a7fd31f
No related branches found
No related tags found
No related merge requests found
# Setup MEX interface if Matlab was found # Setup MEX interface if Matlab was found
add_library(HydraMex MODULE "") add_library(HydraMex MODULE "")
# Set up custom post-build command to run MATLAB build scripts
include(autoBuildMex.cmake)
# Require c++11 and set build definition to MEX_BUILD # Require c++11 and set build definition to MEX_BUILD
target_compile_features(HydraMex PRIVATE cxx_std_11) target_compile_features(HydraMex PRIVATE cxx_std_11)
target_compile_definitions(HydraMex PRIVATE MEX_BUILD) target_compile_definitions(HydraMex PRIVATE MEX_BUILD)
...@@ -13,7 +16,7 @@ endif() ...@@ -13,7 +16,7 @@ endif()
# Link against Matlab libraries # Link against Matlab libraries
target_link_libraries(HydraMex PRIVATE HydraCudaLib ${Matlab_MX_LIBRARY} ${Matlab_MEX_LIBRARY}) target_link_libraries(HydraMex PRIVATE HydraCudaLib ${Matlab_MX_LIBRARY} ${Matlab_MEX_LIBRARY})
# Change output library name to Hydra.mex<plaform> # Change output library name to <ModuleName>.mex<plaform>
set_target_properties(HydraMex set_target_properties(HydraMex
PROPERTIES PROPERTIES
OUTPUT_NAME ${HYDRA_MODULE_NAME} OUTPUT_NAME ${HYDRA_MODULE_NAME}
...@@ -28,7 +31,6 @@ target_include_directories(HydraMex PRIVATE ${Matlab_INCLUDE_DIRS}) ...@@ -28,7 +31,6 @@ target_include_directories(HydraMex PRIVATE ${Matlab_INCLUDE_DIRS})
# Setup src include directories # Setup src include directories
target_include_directories(HydraMex target_include_directories(HydraMex
PRIVATE PRIVATE
$<INSTALL_INTERFACE:include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/..> $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/..>
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/../ScriptCmds> $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/../ScriptCmds>
......
...@@ -19,6 +19,7 @@ set_target_properties(HydraPy ...@@ -19,6 +19,7 @@ set_target_properties(HydraPy
OUTPUT_NAME ${HYDRA_MODULE_NAME} OUTPUT_NAME ${HYDRA_MODULE_NAME}
PREFIX "" PREFIX ""
POSITION_INDEPENDENT_CODE ON POSITION_INDEPENDENT_CODE ON
LIBRARY_OUTPUT_DIRECTORY $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src/Python>
) )
# On windows specifically set the suffix to .pyd # On windows specifically set the suffix to .pyd
...@@ -32,7 +33,6 @@ target_include_directories(HydraPy PRIVATE Python::Python Python::NumPy) ...@@ -32,7 +33,6 @@ target_include_directories(HydraPy PRIVATE Python::Python Python::NumPy)
# Setup src include directories # Setup src include directories
target_include_directories(HydraPy target_include_directories(HydraPy
PRIVATE PRIVATE
$<INSTALL_INTERFACE:include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/..> $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/..>
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/../ScriptCmds> $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/../ScriptCmds>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment