Skip to content

Commit 28621b0

Browse files
leochan2009leochan2009
committed
EHN: add library dependency only if the library doesn't exist
1 parent f3bef7f commit 28621b0

File tree

8 files changed

+92
-77
lines changed

8 files changed

+92
-77
lines changed

‎CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ OPTION(BUILD_VIDEOSTREAM "Build the Video Stream." ON)
3333
OPTION(USE_H264 "Link the OpenH264 tree." OFF)
3434
OPTION(USE_VP9 "Link the VP9 tree." OFF)
3535
OPTION(USE_X265 "Link the X265 tree." OFF)
36-
OPTION(USE_OPENHEVC "Link the OpenHevc tree." OFF)
36+
OPTION(USE_OpenHEVC "Link the OpenHEVC tree." OFF)
3737
SET(OpenIGTLink_LINK_H264 "0")
3838
SET(OpenIGTLink_LINK_VP9 "0")
3939
SET(OpenIGTLink_LINK_X265 "0")
@@ -49,7 +49,7 @@ IF(BUILD_VIDEOSTREAM)
4949
IF(USE_X265)
5050
SET(OpenIGTLink_LINK_X265 "1")
5151
ENDIF()
52-
IF(USE_OPENHEVC)
52+
IF(USE_OpenHEVC)
5353
SET(OpenIGTLink_LINK_OPENHEVC "1")
5454
ENDIF()
5555
ENDIF()

‎Source/CMakeLists.txt‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -250,16 +250,28 @@ LIST(APPEND OpenIGTLink_DEPENDENCIES igtlutil)
250250
IF (NOT (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 3.4))
251251
IF(BUILD_VIDEOSTREAM)
252252
IF(USE_H264)
253-
add_dependencies(OpenIGTLink OpenH264)
253+
include(${OpenIGTLink_SOURCE_DIR}/SuperBuild/findOpenH264.cmake)
254+
IF(NOT OpenH264_FOUND)
255+
add_dependencies(OpenIGTLink OpenH264)
256+
ENDIF()
254257
ENDIF()
255258
IF(USE_VP9)
256-
add_dependencies(OpenIGTLink VP9)
259+
include(${OpenIGTLink_SOURCE_DIR}/SuperBuild/findVP9.cmake)
260+
IF(NOT VP9_FOUND)
261+
add_dependencies(OpenIGTLink VP9)
262+
ENDIF()
257263
ENDIF()
258264
IF(USE_X265)
259-
add_dependencies(OpenIGTLink X265)
265+
include(${OpenIGTLink_SOURCE_DIR}/SuperBuild/findX265.cmake)
266+
IF(NOT X265_FOUND)
267+
add_dependencies(OpenIGTLink X265)
268+
ENDIF()
260269
ENDIF()
261-
IF(USE_OPENHEVC)
262-
add_dependencies(OpenIGTLink OpenHEVC)
270+
IF(USE_OpenHEVC)
271+
include(${OpenIGTLink_SOURCE_DIR}/SuperBuild/findOpenHEVC.cmake)
272+
IF(NOT OpenHEVC_FOUND)
273+
add_dependencies(OpenIGTLink OpenHEVC)
274+
ENDIF()
263275
ENDIF()
264276
ENDIF()
265277
IF(BUILD_WEBSOCKET)

‎Source/VideoStreaming/VideoStreaming.cmake‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,12 @@ IF(${OpenIGTLink_PROTOCOL_VERSION} GREATER "2" AND BUILD_VIDEOSTREAM)
9191
ENDIF()
9292
ENDIF()
9393

94-
IF(USE_OPENHEVC)
94+
IF(USE_OpenHEVC)
9595
INCLUDE(${OpenIGTLink_SOURCE_DIR}/SuperBuild/External_openHEVC.cmake)
9696
LIST(APPEND OpenIGTLink_INCLUDE_DIRS
97-
${OPENHEVC_INCLUDE_DIR}
98-
${OPENHEVC_INCLUDE_DIR}/gpac/modules/openhevc_dec
99-
${OPENHEVC_LIBRARY_DIR}
97+
${OpenHEVC_INCLUDE_DIR}
98+
${OpenHEVC_INCLUDE_DIR}/gpac/modules/openhevc_dec
99+
${OpenHEVC_LIBRARY_DIR}
100100
)
101101
LIST(APPEND OpenIGTLink_SOURCES
102102
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/H265Decoder.cxx
@@ -128,9 +128,9 @@ IF(WIN32) # for Windows
128128
${LINK_X265_LIBRARY}
129129
)
130130
ENDIF()
131-
IF((${OpenIGTLink_PROTOCOL_VERSION} GREATER "2" ) AND USE_OPENHEVC)
131+
IF((${OpenIGTLink_PROTOCOL_VERSION} GREATER "2" ) AND USE_OpenHEVC)
132132
#To do, library name depends on the compiler setting, could be vpxmt.lib and vpxmtd also. Make sure the setting matches.
133-
SET(LINK_OPENHEVC_LIBRARY optimized ${OPENHEVC_LIBRARY_DIR}\\Release\\LibOpenHevcWrapper.lib debug ${OPENHEVC_LIBRARY_DIR}\\Debug\\LibOpenHevcWrapper.lib)
133+
SET(LINK_OPENHEVC_LIBRARY optimized ${OpenHEVC_LIBRARY_DIR}\\Release\\LibOpenHevcWrapper.lib debug ${OpenHEVC_LIBRARY_DIR}\\Debug\\LibOpenHevcWrapper.lib)
134134
LIST(APPEND LINK_LIBS
135135
${LINK_OPENHEVC_LIBRARY}
136136
)
@@ -151,10 +151,10 @@ ELSE() # for POSIX-compatible OSs
151151
${X265_LIBRARY_DIR}/libx265.a
152152
)
153153
ENDIF()
154-
IF((${OpenIGTLink_PROTOCOL_VERSION} GREATER "2" ) AND USE_OPENHEVC)
155-
SET(LINK_OPENHEVC_LIBRARY ${OPENHEVC_LIBRARY_DIR}/libLibOpenHevcWrapper.a)
154+
IF((${OpenIGTLink_PROTOCOL_VERSION} GREATER "2" ) AND USE_OpenHEVC)
155+
SET(LINK_OPENHEVC_LIBRARY ${OpenHEVC_LIBRARY_DIR}/libLibOpenHevcWrapper.a)
156156
IF (CMAKE_CONFIGURATION_TYPES)
157-
SET(LINK_OPENHEVC_LIBRARY optimized ${OPENHEVC_LIBRARY_DIR}/Release/libLibOpenHevcWrapper.a debug ${OPENHEVC_LIBRARY_DIR}/Debug/libLibOpenHevcWrapper.a)
157+
SET(LINK_OPENHEVC_LIBRARY optimized ${OpenHEVC_LIBRARY_DIR}/Release/libLibOpenHevcWrapper.a debug ${OpenHEVC_LIBRARY_DIR}/Debug/libLibOpenHevcWrapper.a)
158158
ENDIF()
159159
LIST(APPEND LINK_LIBS
160160
${LINK_OPENHEVC_LIBRARY}

‎SuperBuild/External_openHEVC.cmake‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,39 +6,39 @@ SET(OpenHEVC_DEPENDENCIES)
66
IF(NOT YASM_FOUND)
77
LIST(APPEND OpenHEVC_DEPENDENCIES YASM)
88
ENDIF()
9-
IF(OPENHEVC_FOUND)
10-
# openHEVC has been built already
11-
MESSAGE(STATUS "Using openHEVC available at: ${OPENHEVC_INCLUDE_DIR}")
12-
#FIND_PACKAGE(openHEVC REQUIRED)
13-
#SET(OPENHEVC_LIBRARY_DIR "${openHEVC_DIR}" CACHE INTERNAL "Path to store openHEVC library")
9+
IF(OpenHEVC_FOUND)
10+
# OpenHEVC has been built already
11+
MESSAGE(STATUS "Using OpenHEVC available at: ${OpenHEVC_INCLUDE_DIR}")
12+
#FIND_PACKAGE(OpenHEVC REQUIRED)
13+
#SET(OpenHEVC_LIBRARY_DIR "${OpenHEVC_DIR}" CACHE INTERNAL "Path to store OpenHEVC library")
1414
ELSE()
15-
# openHEVC has not been built yet, so download and build it as an external project
15+
# OpenHEVC has not been built yet, so download and build it as an external project
1616
SET(GIT_REPOSITORY "https://github.com/openigtlink/openHEVC.git")
1717
SET(GIT_TAG "master")
1818

1919
IF(MSVC)
2020
LIST(APPEND PLATFORM_SPECIFIC_ARGS -DCMAKE_CXX_MP_FLAG:BOOL=ON)
2121
ENDIF()
2222

23-
MESSAGE(STATUS "Downloading openHEVC ${GIT_TAG} from: ${GIT_REPOSITORY}")
23+
MESSAGE(STATUS "Downloading OpenHEVC ${GIT_TAG} from: ${GIT_REPOSITORY}")
2424

25-
SET (OPENHEVC_INCLUDE_DIR "${CMAKE_BINARY_DIR}/Deps/openHEVC" CACHE PATH "openHEVC source directory" FORCE)
26-
SET (OPENHEVC_LIBRARY_DIR "${CMAKE_BINARY_DIR}/Deps/openHEVC-bin" CACHE PATH "openHEVC library directory" FORCE)
25+
SET (OpenHEVC_INCLUDE_DIR "${CMAKE_BINARY_DIR}/Deps/OpenHEVC" CACHE PATH "OpenHEVC source directory" FORCE)
26+
SET (OpenHEVC_LIBRARY_DIR "${CMAKE_BINARY_DIR}/Deps/OpenHEVC-bin" CACHE PATH "OpenHEVC library directory" FORCE)
2727

2828
ExternalProject_Add( OpenHEVC
29-
PREFIX "${CMAKE_BINARY_DIR}/Deps/openHEVC-prefix"
30-
SOURCE_DIR "${OPENHEVC_INCLUDE_DIR}"
31-
BINARY_DIR "${OPENHEVC_LIBRARY_DIR}"
29+
PREFIX "${CMAKE_BINARY_DIR}/Deps/OpenHEVC-prefix"
30+
SOURCE_DIR "${OpenHEVC_INCLUDE_DIR}"
31+
BINARY_DIR "${OpenHEVC_LIBRARY_DIR}"
3232
#--Download step--------------
3333
GIT_REPOSITORY "${GIT_REPOSITORY}"
3434
GIT_TAG ${GIT_TAG}
3535
#--Configure step-------------
3636
CMAKE_ARGS
3737
${PLATFORM_SPECIFIC_ARGS}
38-
-DCMAKE_INSTALL_PREFIX:PATH="${CMAKE_BINARY_DIR}/Deps/openHEVC-install"
39-
-DCMAKE_LIBRARY_OUTPUT_DIRECTORY:STRING=${OPENHEVC_LIBRARY_DIR}
40-
-DCMAKE_RUNTIME_OUTPUT_DIRECTORY:STRING=${OPENHEVC_LIBRARY_DIR}
41-
-DCMAKE_ARCHIVE_OUTPUT_DIRECTORY:PATH=${OPENHEVC_LIBRARY_DIR}
38+
-DCMAKE_INSTALL_PREFIX:PATH="${CMAKE_BINARY_DIR}/Deps/OpenHEVC-install"
39+
-DCMAKE_LIBRARY_OUTPUT_DIRECTORY:STRING=${OpenHEVC_LIBRARY_DIR}
40+
-DCMAKE_RUNTIME_OUTPUT_DIRECTORY:STRING=${OpenHEVC_LIBRARY_DIR}
41+
-DCMAKE_ARCHIVE_OUTPUT_DIRECTORY:PATH=${OpenHEVC_LIBRARY_DIR}
4242
-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
4343
-DBUILD_SHARED_LIBS:BOOL=${OpenIGTLink_BUILD_SHARED_LIBS}
4444
-DCMAKE_CXX_FLAGS:STRING=${CMAKE_CXX_FLAGS}

‎SuperBuild/External_yasm.cmake‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,25 @@ ELSE()
1818
MESSAGE(STATUS "Downloading yasm ${GIT_TAG} from: ${GIT_REPOSITORY}")
1919

2020
SET (YASM_SOURCE_DIR "${CMAKE_BINARY_DIR}/Deps/yasm" CACHE PATH "YASM source directory" FORCE)
21-
SET (YASM_BINART_DIR "${CMAKE_BINARY_DIR}/Deps/yasm-bin" CACHE PATH "YASM library directory" FORCE)
22-
21+
SET (YASM_BINARY_DIR "${CMAKE_BINARY_DIR}/Deps/yasm-bin" CACHE PATH "YASM library directory" FORCE)
22+
IF(TARGET YASM)
23+
return()
24+
ENDIF()
2325
ExternalProject_Add( YASM
2426
PREFIX "${CMAKE_BINARY_DIR}/Deps/yasm-prefix"
2527
SOURCE_DIR "${YASM_SOURCE_DIR}"
26-
BINARY_DIR "${YASM_BINART_DIR}"
28+
BINARY_DIR "${YASM_BINARY_DIR}"
2729
#--Download step--------------
2830
GIT_REPOSITORY "${GIT_REPOSITORY}"
2931
GIT_TAG ${GIT_TAG}
3032
#--Configure step-------------
3133
CMAKE_ARGS
3234
${PLATFORM_SPECIFIC_ARGS}
33-
-DCMAKE_LIBRARY_OUTPUT_DIRECTORY:STRING=${YASM_BINART_DIR}
34-
-DCMAKE_RUNTIME_OUTPUT_DIRECTORY:STRING=${YASM_BINART_DIR}
35+
-DCMAKE_LIBRARY_OUTPUT_DIRECTORY:STRING=${YASM_BINARY_DIR}
36+
-DCMAKE_RUNTIME_OUTPUT_DIRECTORY:STRING=${YASM_BINARY_DIR}
3537
-DYASM_INSTALL_BIN_DIR:STRING="bin"
3638
-DPYTHON_EXECUTABLE:STRING=${PYTHON_EXECUTABLE}
37-
-DCMAKE_ARCHIVE_OUTPUT_DIRECTORY:PATH=${YASM_BINART_DIR}
39+
-DCMAKE_ARCHIVE_OUTPUT_DIRECTORY:PATH=${YASM_BINARY_DIR}
3840
-DBUILD_SHARED_LIBS:BOOL=${OpenIGTLink_BUILD_SHARED_LIBS}
3941
-DBUILD_TESTING:BOOL=OFF
4042
-DBUILD_EXAMPLES:BOOL=OFF

‎SuperBuild/Superbuild.cmake‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,32 @@ SET(OpenIGTLink_DEPENDENCIES)
44
#---------------------------------------------------
55
# VideoStreaming dependencies
66
IF(BUILD_VIDEOSTREAM)
7-
IF(USE_H264)
8-
set(OpenH264_INCLUDE_DIR "" CACHE PATH "H264 source directory" FORCE)
9-
set(OpenH264_LIBRARY_DIR "" CACHE PATH "H264 library directory" FORCE)
7+
IF(USE_H264)
108
INCLUDE(${CMAKE_CURRENT_LIST_DIR}/External_openh264.cmake)
9+
IF(NOT OpenH264_FOUND)
10+
LIST(APPEND OpenIGTLink_DEPENDENCIES OpenH264)
11+
ENDIF()
1112
ENDIF()
1213

1314
IF(USE_VP9)
14-
set(VP9_INCLUDE_DIR "" CACHE PATH "VP9 source directory" FORCE)
15-
set(VP9_LIBRARY_DIR "" CACHE PATH "VP9 library directory" FORCE)
1615
INCLUDE(${CMAKE_CURRENT_LIST_DIR}/External_VP9.cmake)
17-
LIST(APPEND OpenIGTLink_DEPENDENCIES VP9)
16+
IF(NOT VP9_FOUND)
17+
LIST(APPEND OpenIGTLink_DEPENDENCIES VP9)
18+
ENDIF()
1819
ENDIF()
1920

2021
IF(USE_X265)
21-
set(X265_INCLUDE_DIR "" CACHE PATH "X265 source directory" FORCE)
22-
set(X265_LIBRARY_DIR "" CACHE PATH "X265 library directory" FORCE)
2322
INCLUDE(${CMAKE_CURRENT_LIST_DIR}/External_X265.cmake)
24-
LIST(APPEND OpenIGTLink_DEPENDENCIES X265)
23+
IF(NOT X265_FOUND)
24+
LIST(APPEND OpenIGTLink_DEPENDENCIES X265)
25+
ENDIF()
2526
ENDIF()
2627

27-
IF(USE_OPENHEVC)
28-
set(OPENHEVC_INCLUDE_DIR "" CACHE PATH "OpenHEVC source directory" FORCE)
29-
set(OPENHEVC_LIBRARY_DIR "" CACHE PATH "OpenHEVC library directory" FORCE)
30-
INCLUDE(${CMAKE_CURRENT_LIST_DIR}/External_openHEVC.cmake)
31-
LIST(APPEND OpenIGTLink_DEPENDENCIES OpenHEVC)
28+
IF(USE_OpenHEVC)
29+
INCLUDE(${CMAKE_CURRENT_LIST_DIR}/External_openHEVC.cmake)
30+
IF(NOT OpenHEVC_FOUND)
31+
LIST(APPEND OpenIGTLink_DEPENDENCIES OpenHEVC)
32+
ENDIF()
3233
ENDIF()
3334

3435
IF(BUILD_WEBSOCKET)
@@ -42,8 +43,8 @@ ExternalProject_Add( OpenIGTLink-lib
4243
SOURCE_DIR "${CMAKE_BINARY_DIR}/OpenIGTLink"
4344
BINARY_DIR "${CMAKE_BINARY_DIR}/OpenIGTLink-bin"
4445
#--Download step--------------
45-
GIT_REPOSITORY "https://github.com/leochan2009/OpenIGTLink.git"
46-
GIT_TAG superbuild-findmodules
46+
GIT_REPOSITORY "https://github.com/openigtlink/OpenIGTLink.git"
47+
GIT_TAG master
4748
#--Configure step-------------
4849
CMAKE_ARGS
4950
${PLATFORM_SPECIFIC_ARGS}
@@ -59,7 +60,7 @@ ExternalProject_Add( OpenIGTLink-lib
5960
-DUSE_H264:BOOL=${USE_H264}
6061
-DUSE_VP9:BOOL=${USE_VP9}
6162
-DUSE_X265:BOOL=${USE_X265}
62-
-DUSE_OPENHEVC:BOOL=${USE_OPENHEVC}
63+
-DUSE_OpenHEVC:BOOL=${USE_OpenHEVC}
6364
-DBUILD_WEBSOCKET:BOOL=${BUILD_WEBSOCKET}
6465
-DBUILD_EXAMPLES:BOOL=${BUILD_EXAMPLES}
6566
-DCMAKE_CXX_FLAGS:STRING=${CMAKE_CXX_FLAGS}
@@ -68,10 +69,11 @@ ExternalProject_Add( OpenIGTLink-lib
6869
-DOpenH264_LIBRARY_DIR:STRING=${OpenH264_LIBRARY_DIR}
6970
-DX265_INCLUDE_DIR:STRING=${X265_INCLUDE_DIR}
7071
-DX265_LIBRARY_DIR:STRING=${X265_LIBRARY_DIR}
71-
-DOPENHEVC_INCLUDE_DIR:STRING=${OPENHEVC_INCLUDE_DIR}
72-
-DOPENHEVC_LIBRARY_DIR:STRING=${OPENHEVC_LIBRARY_DIR}
72+
-DOpenHEVC_INCLUDE_DIR:STRING=${OpenHEVC_INCLUDE_DIR}
73+
-DOpenHEVC_LIBRARY_DIR:STRING=${OpenHEVC_LIBRARY_DIR}
7374
-DVP9_INCLUDE_DIR:STRING=${VP9_INCLUDE_DIR}
7475
-DVP9_LIBRARY_DIR:STRING=${VP9_LIBRARY_DIR}
76+
-DYASM_BINARY_DIR:STRING=${YASM_BINARY_DIR}
7577
#--Build step-----------------
7678
BUILD_ALWAYS 1
7779
#--Install step-----------------

‎SuperBuild/findOpenHEVC.cmake‎

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# - The OPENHEVC library
22
# Once done this will define
33
#
4-
# OPENHEVC_ROOT - A list of search hints
4+
# Open - A list of search hints
55
#
6-
# OPENHEVC_FOUND - found OPENHEVC
7-
# OPENHEVC_INCLUDE_DIR - the OPENHEVC include directory
8-
# OPENHEVC_LIBRARY_DIR - OPENHEVC library directory
6+
# OpenHEVC_FOUND - found OpenHEVC
7+
# OpenHEVC_INCLUDE_DIR - the OpenHEVC include directory
8+
# OpenHEVC_LIBRARY_DIR - OpenHEVC library directory
99

10-
IF((EXISTS ${OPENHEVC_INCLUDE_DIR}) AND (EXISTS ${OPENHEVC_LIBRARY_DIR}))
11-
IF(EXISTS "${OPENHEVC_INCLUDE_DIR}/openHevcWrapper.h")
10+
IF((EXISTS ${OpenHEVC_INCLUDE_DIR}) AND (EXISTS ${OpenHEVC_LIBRARY_DIR}))
11+
IF(EXISTS "${OpenHEVC_INCLUDE_DIR}/openHevcWrapper.h")
1212
IF(WIN32)
1313
ELSE()
1414
IF(${CMAKE_BUILD_TYPE})
@@ -24,26 +24,25 @@ IF((EXISTS ${OPENHEVC_INCLUDE_DIR}) AND (EXISTS ${OPENHEVC_LIBRARY_DIR}))
2424
ENDIF()
2525
ENDIF()
2626

27-
SET( OPENHEVC_PATH_HINTS
28-
${OPENHEVC_ROOT}
29-
${OPENHEVC_INCLUDE_DIR}
30-
${OPENHEVC_LIBRARY_DIR}
27+
SET( OpenHEVC_PATH_HINTS
28+
${OpenHEVC_ROOT}
29+
${OpenHEVC_INCLUDE_DIR}
30+
${OpenHEVC_LIBRARY_DIR}
3131
)
3232

33-
unset(OPENHEVC_INCLUDE_DIR CACHE)
34-
find_path(OPENHEVC_INCLUDE_DIR NAMES openHevcWrapper.h
33+
unset(OpenHEVC_INCLUDE_DIR CACHE)
34+
find_path(OpenHEVC_INCLUDE_DIR NAMES openHevcWrapper.h
3535
PATH_SUFFIXES gpac/modules/openhevc_dec
36-
HINTS ${OPENHEVC_PATH_HINTS}
36+
HINTS ${OpenHEVC_PATH_HINTS}
3737
)
3838

39-
unset(OPENHEVC_LIBRARY_DIR CACHE)
40-
find_path(OPENHEVC_LIBRARY_DIR
39+
unset(OpenHEVC_LIBRARY_DIR CACHE)
40+
find_path(OpenHEVC_LIBRARY_DIR
4141
NAMES LibOpenHevcWrapper${CMAKE_STATIC_LIBRARY_SUFFIX} libLibOpenHevcWrapper.a
4242
PATH_SUFFIXES ${CMAKE_BUILD_TYPE}
43-
HINTS ${OPENHEVC_PATH_HINTS}
43+
HINTS ${OpenHEVC_PATH_HINTS}
4444
)
45-
4645
include(FindPackageHandleStandardArgs)
47-
FIND_PACKAGE_HANDLE_STANDARD_ARGS(OPENHEVC REQUIRED_VARS OPENHEVC_LIBRARY_DIR OPENHEVC_INCLUDE_DIR)
46+
FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenHEVC REQUIRED_VARS OpenHEVC_LIBRARY_DIR OpenHEVC_INCLUDE_DIR)
4847

49-
mark_as_advanced(OPENHEVC_INCLUDE_DIR OPENHEVC_LIBRARY_DIR)
48+
mark_as_advanced(OpenHEVC_INCLUDE_DIR OpenHEVC_LIBRARY_DIR)

‎Testing/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ IF(${OpenIGTLink_PROTOCOL_VERSION} GREATER "2")
202202
ADD_TEST(igtlMessageRTPWrapperTestFormatVersion2 ${OpenIGTLink_EXECUTABLE_PATH}/igtlMessageRTPWrapperTest ${TestStringFormat2})
203203
ENDIF()
204204

205-
IF(${OpenIGTLink_PROTOCOL_VERSION} GREATER "2" AND BUILD_VIDEOSTREAM AND (USE_H264 OR USE_VP9 OR (USE_X265 AND USE_OPENHEVC)))
205+
IF(${OpenIGTLink_PROTOCOL_VERSION} GREATER "2" AND BUILD_VIDEOSTREAM AND (USE_H264 OR USE_VP9 OR (USE_X265 AND USE_OpenHEVC)))
206206
ADD_TEST(igtlVideoMessageTestFormatVersion1 ${OpenIGTLink_EXECUTABLE_PATH}/igtlVideoMessageTest ${TestStringFormat1})
207207
ADD_TEST(igtlVideoMessageTestFormatVersion2 ${OpenIGTLink_EXECUTABLE_PATH}/igtlVideoMessageTest ${TestStringFormat2})
208208
ADD_TEST(igtlVideoMetaMessageTestFormatVersion2 ${OpenIGTLink_EXECUTABLE_PATH}/igtlVideoMetaMessageTest ${TestStringFormat2})

0 commit comments

Comments
 (0)