Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Institute of Technical Acoustics (ITA)
VANet
Commits
fd0e3059
Commit
fd0e3059
authored
Oct 04, 2016
by
Jonas Stienen
Browse files
Fixing static linking stuff against vista
parent
9e17828b
Changes
2
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
fd0e3059
...
...
@@ -20,7 +20,7 @@ if( NOT DEFINED ITA_VANET_INSTALL_WITH_DLLS )
endif
(
NOT DEFINED ITA_VANET_INSTALL_WITH_DLLS
)
vista_use_package
(
VistaCoreLibs REQUIRED COMPONENTS VistaInterProcComm FIND_DEPENDENCIES
)
vista_use_package
(
VistaCoreLibs REQUIRED COMPONENTS
VistaBase
VistaInterProcComm FIND_DEPENDENCIES
)
vista_use_package
(
VABase REQUIRED
)
# Including the source files of all source subfolders recursively
...
...
tests/VANetTestClient/CMakeLists.txt
View file @
fd0e3059
...
...
@@ -8,13 +8,32 @@ if( NOT VANET_COMMON_BUILD )
endif
()
vista_use_package
(
VABase REQUIRED FIND_DEPENDENCIES
)
vista_use_package
(
VANet REQUIRED FIND_DEPENDENCIES
)
vista_use_package
(
VistaCoreLibs REQUIRED COMPONENTS VistaBase FIND_DEPENDENCIES
)
add_definitions
(
-DVABASE_DLL -DVANET_DLL
)
if
(
NOT DEFINED ITA_VISTA_BUILD_STATIC
)
set
(
ITA_VISTA_BUILD_STATIC OFF CACHE BOOL
"Build against static ViSTA libraries"
)
endif
(
NOT DEFINED ITA_VISTA_BUILD_STATIC
)
if
(
NOT DEFINED ITA_VA_BUILD_STATIC
)
set
(
ITA_VA_BUILD_STATIC OFF CACHE BOOL
"Link aginst static VA libs"
)
endif
(
NOT DEFINED ITA_VA_BUILD_STATIC
)
# compiler
if
(
ITA_VISTA_BUILD_STATIC
)
add_definitions
(
-DVISTABASE_STATIC -DVISTAINTERPROCCOMM_STATIC -DVISTAASPECTS_STATIC -DVISTATOOLS_STATIC -DVISTAMATH_STATIC
)
if
(
WIN32
)
set
(
VISTAINTERPROCCOMM_ADDITIONAL_DEPENDENCIES Ws2_32
)
endif
(
WIN32
)
endif
(
ITA_VISTA_BUILD_STATIC
)
if
(
ITA_VA_BUILD_STATIC
)
add_definitions
(
-DVABASE_STATIC -DVACORE_STATIC -DVANET_STATIC
)
endif
(
ITA_VA_BUILD_STATIC
)
add_executable
(
VANetClientTest VANetClientTest.cpp
)
target_link_libraries
(
VANetClientTest
${
VISTA_USE_PACKAGE_LIBRARIES
}
)
target_link_libraries
(
VANetClientTest
${
VISTA_USE_PACKAGE_LIBRARIES
}
${
VISTAINTERPROCCOMM_ADDITIONAL_DEPENDENCIES
}
)
vista_configure_app
(
VANetClientTest
)
vista_install
(
VANetClientTest
)
...
...
Write
Preview
Supports
Markdown
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