Skip to content

Commit 72256c9

Browse files
committed
audio: always link coVRAudio, it is not a conditional target anymore
1 parent dbf7c6a commit 72256c9

3 files changed

Lines changed: 4 additions & 12 deletions

File tree

src/OpenCOVER/cover/CMakeLists.txt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -308,14 +308,10 @@ ENDIF(WIN32)
308308

309309
COVISE_WNOERROR(${COVERKERNEL_TARGET} BASEARCH zebu)
310310

311-
TARGET_LINK_LIBRARIES(${COVERKERNEL_TARGET} coOpenVRUI coOSGVRUI coMessages coOpenConfig
311+
TARGET_LINK_LIBRARIES(${COVERKERNEL_TARGET} coOpenVRUI coOSGVRUI coMessages coOpenConfig coVRAudio
312312
${COVISE_VRBCLIENT_LIBRARY} ${COVISE_GRMSG_LIBRARY} ${COVISE_UTIL_LIBRARY} ${COVISE_GPU_LIBRARIES} ${COVISE_NET_LIBRARY}
313313
${XERCESC_LIBRARIES} ${OPENSCENEGRAPH_LIBRARIES} ${TIFF_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${EXTRA_LIBS})
314314

315-
if(TARGET coVRAudio)
316-
target_link_libraries(${COVERKERNEL_TARGET} coVRAudio)
317-
endif()
318-
319315
TARGET_LINK_LIBRARIES(${COVERKERNEL_TARGET} Pal::Sigslot)
320316

321317
IF(CURL_FOUND)

src/OpenCOVER/plugins/hlrs/GPS/CMakeLists.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,5 @@ SET(SOURCES
1818
PointSensor.cpp
1919
)
2020
cover_add_plugin(GPS ${HEADERS} ${SOURCES})
21-
if (TARGET coVRAudio)
22-
target_link_libraries(GPS coVRAudio)
23-
endif()
21+
22+
target_link_libraries(GPS coVRAudio)

src/OpenCOVER/vrml97/vrml/CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -347,14 +347,11 @@ TARGET_LINK_LIBRARIES(coVRML
347347
coJS
348348
coNet
349349
coOpenConfig
350+
coVRAudio
350351
${COVISE_UTIL_LIBRARY}
351352
${EXTRA_LIBS}
352353
${CMAKE_THREAD_LIBS_INIT}
353354
)
354355

355-
if (TARGET coVRAudio)
356-
TARGET_LINK_LIBRARIES(coVRML coVRAudio)
357-
endif()
358-
359356
COVISE_INSTALL_TARGET(coVRML)
360357
COVISE_INSTALL_HEADERS(vrml97/vrml ${VRML_HEADERS})

0 commit comments

Comments
 (0)