Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
ITACoreLibs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Institute of Technical Acoustics (ITA)
ITACoreLibs
Commits
8adf19eb
Commit
8adf19eb
authored
Jan 20, 2017
by
Jonas Stienen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adding MSVC include for VistaCoreLibs Projects (configurable with CMake, default off)
parent
4c01e9b8
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
2 deletions
+9
-2
CMakeLists.txt
CMakeLists.txt
+9
-2
No files found.
CMakeLists.txt
View file @
8adf19eb
...
@@ -11,7 +11,6 @@ list( APPEND CMAKE_MODULE_PATH "$ENV{VISTA_CMAKE_COMMON}" )
...
@@ -11,7 +11,6 @@ list( APPEND CMAKE_MODULE_PATH "$ENV{VISTA_CMAKE_COMMON}" )
include
(
VistaCommon
)
include
(
VistaCommon
)
# Some global settings for static/shared library generation
# Some global settings for static/shared library generation
if
(
NOT DEFINED ITA_VISTA_BUILD_STATIC
)
if
(
NOT DEFINED ITA_VISTA_BUILD_STATIC
)
set
(
ITA_VISTA_BUILD_STATIC OFF CACHE BOOL
"Build against static ViSTA libraries"
)
set
(
ITA_VISTA_BUILD_STATIC OFF CACHE BOOL
"Build against static ViSTA libraries"
)
...
@@ -37,7 +36,6 @@ if( MSVC )
...
@@ -37,7 +36,6 @@ if( MSVC )
add_definitions
(
"/wd4251 /W4 -D_CRT_SECURE_NO_WARNINGS"
)
add_definitions
(
"/wd4251 /W4 -D_CRT_SECURE_NO_WARNINGS"
)
endif
()
endif
()
# ITACoreLibs submodules
# ITACoreLibs submodules
set
(
ITA_CORE_LIBS_COMMON_BUILD TRUE
)
set
(
ITA_CORE_LIBS_COMMON_BUILD TRUE
)
add_subdirectory
(
ITABase
)
add_subdirectory
(
ITABase
)
...
@@ -47,3 +45,12 @@ add_subdirectory( ITADataSources )
...
@@ -47,3 +45,12 @@ add_subdirectory( ITADataSources )
add_subdirectory
(
ITAConvolution
)
add_subdirectory
(
ITAConvolution
)
add_subdirectory
(
ITACTC
)
add_subdirectory
(
ITACTC
)
add_subdirectory
(
ITASampler
)
add_subdirectory
(
ITASampler
)
if
(
MSVC
)
set
(
ITA_CORE_LIBS_INCLUDE_EXTERNAL_MSVC_PROJECTS OFF CACHE BOOL
"If enabled, msvc projects of external vista packages will be included in the solution"
)
if
(
ITA_CORE_LIBS_INCLUDE_EXTERNAL_MSVC_PROJECTS
)
vista_use_package
(
VistaCoreLibs
)
vista_add_external_msvc_project_of_package
(
VistaCoreLibs
"VistaCoreLibs"
DEPENDENT ITABase DEPENDS VistaBase VistaInterProcComm VistaTools
)
message
(
"hi"
)
endif
(
)
endif
(
)
\ No newline at end of file
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