Commit 565d42f3 authored by jeremad's avatar jeremad Committed by jeremad

chore(cmake): remove some useless refs to external deps

parent 8763ffb5
...@@ -39,7 +39,6 @@ target_include_directories(${PLUGIN_NAME} PRIVATE .) ...@@ -39,7 +39,6 @@ target_include_directories(${PLUGIN_NAME} PRIVATE .)
# but only reference DeckLinkAPI_h.h? Then the search path should be fine. # but only reference DeckLinkAPI_h.h? Then the search path should be fine.
target_include_directories(${PLUGIN_NAME} PRIVATE ../common/include) target_include_directories(${PLUGIN_NAME} PRIVATE ../common/include)
target_include_directories(${PLUGIN_NAME} PRIVATE "${CMAKE_EXTERNAL_DEPS}/include/decklink")
set_property(TARGET ${PLUGIN_NAME} PROPERTY CXX_STANDARD 14) set_property(TARGET ${PLUGIN_NAME} PROPERTY CXX_STANDARD 14)
......
...@@ -188,10 +188,6 @@ endif(USE_AVFORMAT) ...@@ -188,10 +188,6 @@ endif(USE_AVFORMAT)
include_lib_vs_headers(${PLUGIN_NAME}) include_lib_vs_headers(${PLUGIN_NAME})
target_include_directories(${PLUGIN_NAME} PRIVATE ${CMAKE_EXTERNAL_DEPS}/include)
target_include_directories(${PLUGIN_NAME} PRIVATE ${CMAKE_EXTERNAL_DEPS}/include/Intel_Media_SDK)
if(RTMP_QUICKSYNC) if(RTMP_QUICKSYNC)
target_include_directories(${PLUGIN_NAME} PRIVATE Intel/include) target_include_directories(${PLUGIN_NAME} PRIVATE Intel/include)
target_compile_definitions(${PLUGIN_NAME} PRIVATE SUP_QUICKSYNC) target_compile_definitions(${PLUGIN_NAME} PRIVATE SUP_QUICKSYNC)
...@@ -213,11 +209,6 @@ elseif(RTMP_NVENC_M) ...@@ -213,11 +209,6 @@ elseif(RTMP_NVENC_M)
target_link_libraries(${PLUGIN_NAME} PRIVATE ${libv4l2}) target_link_libraries(${PLUGIN_NAME} PRIVATE ${libv4l2})
endif(RTMP_NVENC) endif(RTMP_NVENC)
if(LINUX)
# needed to include x264.h
target_include_directories(${PLUGIN_NAME} PRIVATE ${CMAKE_EXTERNAL_DEPS}/include/ffmpeg)
endif(LINUX)
target_include_directories(${PLUGIN_NAME} PRIVATE include) target_include_directories(${PLUGIN_NAME} PRIVATE include)
target_include_directories(${PLUGIN_NAME} PRIVATE ../common/include) target_include_directories(${PLUGIN_NAME} PRIVATE ../common/include)
target_include_directories(${PLUGIN_NAME} PRIVATE "${INTEL_MEDIA_SDK_PATH}\\include") target_include_directories(${PLUGIN_NAME} PRIVATE "${INTEL_MEDIA_SDK_PATH}\\include")
...@@ -230,7 +221,6 @@ if(WINDOWS) ...@@ -230,7 +221,6 @@ if(WINDOWS)
find_library(libx264 libx264 REQUIRED) find_library(libx264 libx264 REQUIRED)
find_library(librtmp librtmp REQUIRED) find_library(librtmp librtmp REQUIRED)
find_package(mp3lame CONFIG REQUIRED) find_package(mp3lame CONFIG REQUIRED)
find_library(libmpghip libmpghip-static HINTS "${CMAKE_EXTERNAL_LIB}/lame" REQUIRED NO_DEFAULT_PATH)
set(DirectX_LIB set(DirectX_LIB
dxva2 dxva2
d3d9 d3d9
......
...@@ -43,7 +43,6 @@ if(LINUX) ...@@ -43,7 +43,6 @@ if(LINUX)
find_library(CUDART cudart PATHS ${LINUX_CUDA_PATH}) find_library(CUDART cudart PATHS ${LINUX_CUDA_PATH})
find_library(NVML nvidia-ml PATHS "${LINUX_CUDA_PATH}/stubs") find_library(NVML nvidia-ml PATHS "${LINUX_CUDA_PATH}/stubs")
endif() endif()
include_directories(${CMAKE_EXTERNAL_DEPS}/include)
find_library(CUVID nvcuvid) find_library(CUVID nvcuvid)
endif(LINUX) endif(LINUX)
......
...@@ -8,8 +8,6 @@ if(APPLE) ...@@ -8,8 +8,6 @@ if(APPLE)
else() else()
find_path(OpenEXR_ROOT_DIR include/openexr/half.h HINTS /usr/local) find_path(OpenEXR_ROOT_DIR include/openexr/half.h HINTS /usr/local)
endif() endif()
else()
find_path(OpenEXR_ROOT_DIR include/openexr/half.h HINTS "${CMAKE_EXTERNAL_DEPS}" NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
endif() endif()
if(APPLE) if(APPLE)
...@@ -22,8 +20,6 @@ elseif(LINUX) ...@@ -22,8 +20,6 @@ elseif(LINUX)
find_library(OpenEXR_LIBRARY_DIR libHalf.so) find_library(OpenEXR_LIBRARY_DIR libHalf.so)
elseif(ANDROID) elseif(ANDROID)
find_path(OpenEXR_LIBRARY_DIR libHalf.so HINTS "${CMAKE_EXTERNAL_DEPS}" PATH_SUFFIXES lib/openexr/ NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH) find_path(OpenEXR_LIBRARY_DIR libHalf.so HINTS "${CMAKE_EXTERNAL_DEPS}" PATH_SUFFIXES lib/openexr/ NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
elseif(WINDOWS)
find_path(OpenEXR_LIBRARY_DIR Half.lib HINTS "${CMAKE_EXTERNAL_DEPS}" PATH_SUFFIXES lib/openexr/ NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
endif() endif()
if(LINUX) if(LINUX)
...@@ -34,8 +30,6 @@ elseif(APPLE) ...@@ -34,8 +30,6 @@ elseif(APPLE)
elseif() elseif()
find_path(OpenEXR_INCLUDE_DIR OpenEXR/half.h HINTS /usr/local/include) find_path(OpenEXR_INCLUDE_DIR OpenEXR/half.h HINTS /usr/local/include)
endif() endif()
else()
find_path(OpenEXR_INCLUDE_DIR openexr/half.h HINTS "${CMAKE_EXTERNAL_DEPS}" PATH_SUFFIXES include/ NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
endif() endif()
if(LINUX OR APPLE) if(LINUX OR APPLE)
...@@ -63,8 +57,6 @@ foreach(OpenEXR_LIB Half Iex Imath IlmImf IlmThread) ...@@ -63,8 +57,6 @@ foreach(OpenEXR_LIB Half Iex Imath IlmImf IlmThread)
find_library(OpenEXR_${OpenEXR_LIB}_LIBRARY ${OpenEXR_LIB} NO_DEFAULT_PATH HINTS "${CMAKE_EXTERNAL_DEPS}" PATH_SUFFIXES lib/ NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH) find_library(OpenEXR_${OpenEXR_LIB}_LIBRARY ${OpenEXR_LIB} NO_DEFAULT_PATH HINTS "${CMAKE_EXTERNAL_DEPS}" PATH_SUFFIXES lib/ NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
elseif(APPLE) elseif(APPLE)
find_library(OpenEXR_${OpenEXR_LIB}_LIBRARY ${OpenEXR_LIB} NO_DEFAULT_PATH HINTS ${OpenEXR_ROOT_DIR} PATH_SUFFIXES lib/) find_library(OpenEXR_${OpenEXR_LIB}_LIBRARY ${OpenEXR_LIB} NO_DEFAULT_PATH HINTS ${OpenEXR_ROOT_DIR} PATH_SUFFIXES lib/)
else()
find_library(OpenEXR_${OpenEXR_LIB}_LIBRARY ${OpenEXR_LIB} NO_DEFAULT_PATH HINTS "${CMAKE_EXTERNAL_DEPS}" PATH_SUFFIXES lib/openexr/ NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
endif() endif()
if(OpenEXR_${OpenEXR_LIB}_LIBRARY) if(OpenEXR_${OpenEXR_LIB}_LIBRARY)
......
...@@ -20,10 +20,7 @@ function(configure_target BACKEND_NAME) ...@@ -20,10 +20,7 @@ function(configure_target BACKEND_NAME)
target_include_directories(autocrop_${BACKEND_NAME} target_include_directories(autocrop_${BACKEND_NAME}
SYSTEM SYSTEM
PRIVATE ${CMAKE_EXTERNAL_DEPS}/include
PRIVATE ${CMAKE_EXTERNAL_DEPS}/include/ceres
PRIVATE ${EIGEN3_INCLUDE_DIRS} PRIVATE ${EIGEN3_INCLUDE_DIRS}
PRIVATE ${CMAKE_EXTERNAL_DEPS}/include/glog
PRIVATE ${OpenCV_INCLUDE_DIRS}) PRIVATE ${OpenCV_INCLUDE_DIRS})
if (WINDOWS) if (WINDOWS)
......
...@@ -85,10 +85,7 @@ function(configure_target BACKEND_NAME) ...@@ -85,10 +85,7 @@ function(configure_target BACKEND_NAME)
target_include_directories(calibration_${BACKEND_NAME} target_include_directories(calibration_${BACKEND_NAME}
SYSTEM SYSTEM
PRIVATE ${CMAKE_EXTERNAL_DEPS}/include
PRIVATE ${CMAKE_EXTERNAL_DEPS}/include/ceres
PRIVATE ${EIGEN3_INCLUDE_DIRS} PRIVATE ${EIGEN3_INCLUDE_DIRS}
PRIVATE ${CMAKE_EXTERNAL_DEPS}/include/glog
PRIVATE ${OpenCV_INCLUDE_DIRS}) PRIVATE ${OpenCV_INCLUDE_DIRS})
set_property(TARGET calibration_${BACKEND_NAME} PROPERTY CXX_STANDARD 14) set_property(TARGET calibration_${BACKEND_NAME} PROPERTY CXX_STANDARD 14)
......
...@@ -18,10 +18,7 @@ function(configure_target BACKEND_NAME) ...@@ -18,10 +18,7 @@ function(configure_target BACKEND_NAME)
target_include_directories(epipolar_${BACKEND_NAME} target_include_directories(epipolar_${BACKEND_NAME}
SYSTEM SYSTEM
PRIVATE ${CMAKE_EXTERNAL_DEPS}/include
PRIVATE ${CMAKE_EXTERNAL_DEPS}/include/ceres
PRIVATE ${EIGEN3_INCLUDE_DIRS} PRIVATE ${EIGEN3_INCLUDE_DIRS}
PRIVATE ${CMAKE_EXTERNAL_DEPS}/include/glog
PRIVATE ${OpenCV_INCLUDE_DIRS}) PRIVATE ${OpenCV_INCLUDE_DIRS})
if (WINDOWS) if (WINDOWS)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment