Skip to content

O
openpose

sq975 / openpose
与 Fork 源项目一致

从无法访问的项目Fork

通知 7
Star 0
Fork 0
O
openpose

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 ef06d238 编写于 作者: G Gines Hidalgo
浏览文件
操作

OpenCV linking again

上级 258182c2
隐藏空白更改
内联 并排
Showing with 4 addition and 6 deletion
CMakeLists.txt
浏览文件 @ ef06d238
...@@ -572,11 +572,9 @@ if (WIN32) ...@@ -572,11 +572,9 @@ if (WIN32)
endif (WITH_3D_RENDERER) endif (WITH_3D_RENDERER)
message(STATUS "Windows dependencies downloaded.") message(STATUS "Windows dependencies downloaded.")
# set(VS_VERSION "14") set(OPENCV_VS_VERSION "15")
# set(VS_VERSION "15") # Note: VS2017 code seems to simply works in VS2015 find_library(OpenCV_LIBS_RELEASE opencv_world420 HINTS ${FIND_LIB_PREFIX}/opencv/x64/vc${OPENCV_VS_VERSION}/lib)
set(VS_VERSION "16") find_library(OpenCV_LIBS_DEBUG opencv_world420d HINTS ${FIND_LIB_PREFIX}/opencv/x64/vc${OPENCV_VS_VERSION}/lib)
find_library(OpenCV_LIBS_RELEASE opencv_world420 HINTS ${FIND_LIB_PREFIX}/opencv/x64/vc${VS_VERSION}/lib)
find_library(OpenCV_LIBS_DEBUG opencv_world420d HINTS ${FIND_LIB_PREFIX}/opencv/x64/vc${VS_VERSION}/lib)
find_library(GFLAGS_LIBRARY_RELEASE gflags HINTS ${FIND_LIB_PREFIX}/caffe3rdparty/lib) find_library(GFLAGS_LIBRARY_RELEASE gflags HINTS ${FIND_LIB_PREFIX}/caffe3rdparty/lib)
find_library(GFLAGS_LIBRARY_DEBUG gflagsd HINTS ${FIND_LIB_PREFIX}/caffe3rdparty/lib) find_library(GFLAGS_LIBRARY_DEBUG gflagsd HINTS ${FIND_LIB_PREFIX}/caffe3rdparty/lib)
find_library(GLOG_LIBRARY_RELEASE glog HINTS ${FIND_LIB_PREFIX}/caffe3rdparty/lib) find_library(GLOG_LIBRARY_RELEASE glog HINTS ${FIND_LIB_PREFIX}/caffe3rdparty/lib)
...@@ -682,7 +680,7 @@ if (WIN32) ...@@ -682,7 +680,7 @@ if (WIN32)
file(GLOB CAFFE_3RD_PARTY_DLL "${CMAKE_SOURCE_DIR}/3rdparty/windows/caffe3rdparty/lib/*.dll") file(GLOB CAFFE_3RD_PARTY_DLL "${CMAKE_SOURCE_DIR}/3rdparty/windows/caffe3rdparty/lib/*.dll")
file(COPY ${CAFFE_3RD_PARTY_DLL} DESTINATION ${BIN_FOLDER}) file(COPY ${CAFFE_3RD_PARTY_DLL} DESTINATION ${BIN_FOLDER})
# OpenCV DLLs # OpenCV DLLs
file(GLOB OPENCV_DLL "${CMAKE_SOURCE_DIR}/3rdparty/windows/opencv/x64/vc${VS_VERSION}/bin/*.dll") file(GLOB OPENCV_DLL "${CMAKE_SOURCE_DIR}/3rdparty/windows/opencv/x64/vc${OPENCV_VS_VERSION}/bin/*.dll")
file(COPY ${OPENCV_DLL} DESTINATION ${BIN_FOLDER}) file(COPY ${OPENCV_DLL} DESTINATION ${BIN_FOLDER})
# GLUT DLLs # GLUT DLLs
if (WITH_3D_RENDERER OR WITH_3D_ADAM_MODEL) if (WITH_3D_RENDERER OR WITH_3D_ADAM_MODEL)
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或