kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/jriegel/NewWinBuild' into jriegel/review-NewLibPack

Browse Source
This commit is contained in:
jriegel
2014-08-27 16:43:48 +02:00
parent c1f0f70b88 5bdfe81488
commit e2b93c4c80
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cMake/UseLibPack10x.cmake
View File

@@ -294,8 +294,8 @@ set(SOQT_LIBRARY_DEBUG soqt1d.lib)
set(SOQT_FOUND TRUE)
# OpenCV
set(OPENCV_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/opencv)
set(OPENCV_LIBRARIES
set(OPENCV2_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/opencv)
set(OPENCV2_LIBRARIES
optimized opencv_calib3d249.lib
debug opencv_calib3d249d.lib
optimized opencv_contrib249.lib
@@ -335,7 +335,7 @@ set(OPENCV_LIBRARIES
optimized opencv_videostab249.lib
debug opencv_videostab249d.lib
)
set(OPENCV_FOUND TRUE)
set(OPENCV2_FOUND TRUE)
# NGLIB (NetGen)