Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
hydra-image-processor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
OpenSource
hydra-image-processor
Commits
2a0e15d6
Commit
2a0e15d6
authored
4 years ago
by
Mark Winter
Browse files
Options
Downloads
Patches
Plain Diff
Move Python files to appropriate src directory after build
parent
9a7fd31f
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/c/Mex/CMakeLists.txt
+4
-2
4 additions, 2 deletions
src/c/Mex/CMakeLists.txt
src/c/Python/CMakeLists.txt
+1
-1
1 addition, 1 deletion
src/c/Python/CMakeLists.txt
with
5 additions
and
3 deletions
src/c/Mex/CMakeLists.txt
+
4
−
2
View file @
2a0e15d6
# 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>
...
...
This diff is collapsed.
Click to expand it.
src/c/Python/CMakeLists.txt
+
1
−
1
View file @
2a0e15d6
...
...
@@ -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>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment