Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
VAMatlab
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Analytics
Analytics
Code Review
Insights
Issue
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Institute of Technical Acoustics (ITA)
VAMatlab
Commits
ce7d828d
Commit
ce7d828d
authored
Sep 04, 2017
by
Dipl.-Ing. Jonas Stienen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improving build and deploy structure, still no automatic itaVA matlab class install
parent
cff8070f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
11 deletions
+20
-11
CMakeLists.txt
CMakeLists.txt
+20
-11
No files found.
CMakeLists.txt
View file @
ce7d828d
...
...
@@ -20,20 +20,26 @@ if( NOT DEFINED ITA_VAMATLAB_SHOW_BANNER )
set
(
ITA_VAMATLAB_SHOW_BANNER ON CACHE BOOL
"Show VA banner on Matlab init"
)
endif
(
NOT DEFINED ITA_VAMATLAB_SHOW_BANNER
)
if
(
NOT DEFINED ITA_MATLAB_DEPLOY_MATLAB_EXECUTABLE
)
set
(
ITA_MATLAB_DEPLOY_MATLAB_EXECUTABLE ON CACHE BOOL
"Install VAMatlab executable into deploy binary directory"
)
endif
(
)
vista_use_package
(
VABase REQUIRED FIND_DEPENDENCIES
)
vista_use_package
(
VANet REQUIRED FIND_DEPENDENCIES
)
vista_use_package
(
Matlab REQUIRED FIND_DEPENDENCIES
)
vista_use_package
(
NatNetSDK REQUIRED FIND_DEPENDENCIES
)
#
Compiler
if
(
ITA_CORE_LIBS_
BUILD_
STATIC
)
add_definitions
(
-DITA
_BASE_STATIC -DITA_DATA_SOURCES_STATIC -DITA_DIFFRACTION_STATIC -DITA_GEO_STATIC -DITA_CONVOLUTION_STATIC -DITA_FFT_STATIC -DITA_CTC_STATIC -DITA_SAMPLER
_STATIC
)
#
Build settings
if
(
ITA_CORE_LIBS_STATIC
)
add_definitions
(
-DITA
CORELIBS
_STATIC
)
endif
(
)
if
(
ITA_VISTA_BUILD_STATIC
)
add_definitions
(
-DVISTACORELIBS_STATIC
)
list
(
APPEND VISTA_USE_PACKAGE_LIBRARIES ws2_32 winspool
)
add_definitions
(
-DVISTA_STATIC
)
if
(
WIN32
)
list
(
APPEND VISTA_USE_PACKAGE_LIBRARIES ws2_32 winspool
)
endif
(
)
endif
(
)
if
(
NOT BUILD_SHARED_LIBS
)
...
...
@@ -49,7 +55,7 @@ endif( )
add_definitions
(
"-DVAMATLAB_VERSION_MAJOR=
\"
${
ITA_VAMATLAB_VERSION_MAJOR
}
\"
"
)
add_definitions
(
"-DVAMATLAB_VERSION_MINOR=
\"
${
ITA_VAMATLAB_VERSION_MINOR
}
\"
"
)
if
(
ITA_VAMATLAB_SHOW_BANNER
)
add_definitions
(
"-DVAMATLAB_SHOW_BANNER"
)
add_definitions
(
-DVAMATLAB_SHOW_BANNER
)
endif
(
)
...
...
@@ -79,13 +85,10 @@ vista_create_cmake_configs( VAMatlab )
set_property
(
TARGET VAMatlab PROPERTY FOLDER
"VA/Bindings"
)
set_target_properties
(
VAMatlab PROPERTIES SUFFIX
".
${
MATLAB_MEX_EXTENSION
}
"
)
# Build Matlab class and move Matlab executable to bin folder (future work)
if
(
ITA_VA_MATLAB_POSTBUILD_CREATE_MATLAB_CLASS
)
set
(
MATLAB_BUILD_CLASS_COMMAND
"matlab -nodisplay -nosplash -nodesktop -r
\"
run( 'matlab/itaVA_build_absolute.m' )
\"
"
)
add_custom_command
(
TARGET VAMatlab POST_BUILD COMMAND
${
MATLAB_BUILD_CLASS_COMMAND
}
WORKING_DIRECTORY
"
${
CMAKE_CURRENT_SOURCE_DIR
}
"
COMMENT
"Running matlab itaVA installer"
VERBATIM
)
if
(
ITA_MATLAB_DEPLOY_MATLAB_EXECUTABLE
)
install
(
FILES
"
${
CMAKE_BINARY_DIR
}
/lib/VAMatlab.
${
MATLAB_MEX_EXTENSION
}
"
DESTINATION
"bin"
)
endif
(
)
# VA matlab scripts file
set
(
VAMATLAB_BASE_DIR
"
${
CMAKE_INSTALL_PREFIX
}
"
)
configure_file
(
"matlab/itaVA_build.m.proto"
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/matlab/itaVA_build_absolute.m"
@ONLY
)
...
...
@@ -98,3 +101,9 @@ install( FILES "matlab/itaVA.m.proto" DESTINATION "matlab" )
install
(
FILES
"matlab/itaVA_generateStubs.m"
DESTINATION
"matlab"
)
install
(
FILES
"matlab/itaVA_example_simple.m"
DESTINATION
"matlab"
)
install
(
FILES
"matlab/itaVA_example_tracked_listener.m"
DESTINATION
"matlab"
)
# Build Matlab class using Matlab (future work)
if
(
ITA_VA_MATLAB_POSTBUILD_CREATE_MATLAB_CLASS
)
set
(
MATLAB_BUILD_CLASS_COMMAND
"matlab -nodisplay -nosplash -nodesktop -r
\"
run( 'matlab/itaVA_build_absolute.m' )
\"
"
)
add_custom_command
(
TARGET VAMatlab POST_BUILD COMMAND
${
MATLAB_BUILD_CLASS_COMMAND
}
WORKING_DIRECTORY
"
${
CMAKE_CURRENT_SOURCE_DIR
}
"
COMMENT
"Running matlab itaVA installer"
VERBATIM
)
endif
(
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment