From 2a0e15d61d2c6f4d93b68da309cf2fdf4c69345c Mon Sep 17 00:00:00 2001
From: Mark Winter <mwinter@drexel.edu>
Date: Thu, 16 Apr 2020 18:02:34 +0200
Subject: [PATCH] Move Python files to appropriate src directory after build
---
src/c/Mex/CMakeLists.txt | 6 ++++--
src/c/Python/CMakeLists.txt | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/c/Mex/CMakeLists.txt b/src/c/Mex/CMakeLists.txt
index 1c0a082c..c655c795 100644
--- a/src/c/Mex/CMakeLists.txt
+++ b/src/c/Mex/CMakeLists.txt
@@ -1,6 +1,9 @@
# Setup MEX interface if Matlab was found
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
target_compile_features(HydraMex PRIVATE cxx_std_11)
target_compile_definitions(HydraMex PRIVATE MEX_BUILD)
@@ -13,7 +16,7 @@ endif()
# Link against Matlab libraries
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
PROPERTIES
OUTPUT_NAME ${HYDRA_MODULE_NAME}
@@ -28,7 +31,6 @@ target_include_directories(HydraMex PRIVATE ${Matlab_INCLUDE_DIRS})
# Setup src include directories
target_include_directories(HydraMex
PRIVATE
- $<INSTALL_INTERFACE:include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/..>
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/../ScriptCmds>
diff --git a/src/c/Python/CMakeLists.txt b/src/c/Python/CMakeLists.txt
index 0ad2b8f2..350f6bc7 100644
--- a/src/c/Python/CMakeLists.txt
+++ b/src/c/Python/CMakeLists.txt
@@ -19,6 +19,7 @@ set_target_properties(HydraPy
OUTPUT_NAME ${HYDRA_MODULE_NAME}
PREFIX ""
POSITION_INDEPENDENT_CODE ON
+ LIBRARY_OUTPUT_DIRECTORY $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src/Python>
)
# On windows specifically set the suffix to .pyd
@@ -32,7 +33,6 @@ target_include_directories(HydraPy PRIVATE Python::Python Python::NumPy)
# Setup src include directories
target_include_directories(HydraPy
PRIVATE
- $<INSTALL_INTERFACE:include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/..>
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/../ScriptCmds>
--
GitLab