generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed problem with VideoInput on Windows when OpenCV compiled statically (ticket )

Browse Source
This commit is contained in:
Alexander Shishkov 2011-05-30 13:32:57 +00:00
parent dce5bf4921
commit 33e71127f7
5 changed files with 30 additions and 1 deletions

17
CMakeLists.txt

@ -139,6 +139,12 @@ else()
set(OPENCV_SVNVERSION "") set(OPENCV_SVNVERSION "")
endif() endif()
# ----------------------------------------------------------------------------
# Detect Microsoft compiler:
# ----------------------------------------------------------------------------
if(CMAKE_CL_64)
set(MSVC64 1)
endif()
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
# Detect GNU version: # Detect GNU version:
@ -805,6 +811,17 @@ if(WIN32)
if (MSVC) if (MSVC)
set(HIGHGUI_LIBRARIES ${HIGHGUI_LIBRARIES} vfw32) set(HIGHGUI_LIBRARIES ${HIGHGUI_LIBRARIES} vfw32)
if (NOT BUILD_SHARED_LIBS)
if (MSVC64)
if(HAVE_VIDEOINPUT)
set(HIGHGUI_LIBRARIES ${HIGHGUI_LIBRARIES} ${CMAKE_SOURCE_DIR}/3rdparty/lib/videoInput64.lib strmiids)
endif()
elseif (MSVC)
if(HAVE_VIDEOINPUT)
set(HIGHGUI_LIBRARIES ${HIGHGUI_LIBRARIES} ${CMAKE_SOURCE_DIR}/3rdparty/lib/videoInput.lib strmiids)
endif()
endif()
endif()
endif() endif()
if(MINGW) if(MINGW)

4
modules/python/CMakeLists.txt

@ -60,6 +60,10 @@ execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import distutils.sysconfig; pri
set_target_properties(${cv_target} PROPERTIES SUFFIX ${CVPY_SUFFIX}) set_target_properties(${cv_target} PROPERTIES SUFFIX ${CVPY_SUFFIX})
if (MSVC AND NOT BUILD_SHARED_LIBS)
set_target_properties(${cv_target} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:atlthunk.lib /NODEFAULTLIB:atlsd.lib /DEBUG")
endif()
set(cvpymodules ${cv_target}) set(cvpymodules ${cv_target})
if(PYTHON_USE_NUMPY) if(PYTHON_USE_NUMPY)

4
samples/c/CMakeLists.txt

@ -43,8 +43,10 @@ if (BUILD_EXAMPLES)
if(ENABLE_SOLUTION_FOLDERS) if(ENABLE_SOLUTION_FOLDERS)
set_target_properties(${the_target} PROPERTIES FOLDER "samples//c") set_target_properties(${the_target} PROPERTIES FOLDER "samples//c")
endif() endif()
if(WIN32) if(WIN32)
if (MSVC AND NOT BUILD_SHARED_LIBS)
set_target_properties(${the_target} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:atlthunk.lib /NODEFAULTLIB:atlsd.lib /DEBUG")
endif()
install(TARGETS ${the_target} install(TARGETS ${the_target}
RUNTIME DESTINATION "samples/c" COMPONENT main) RUNTIME DESTINATION "samples/c" COMPONENT main)
endif() endif()

3
samples/cpp/CMakeLists.txt

@ -45,6 +45,9 @@ if (BUILD_EXAMPLES)
endif() endif()
if(WIN32) if(WIN32)
if (MSVC AND NOT BUILD_SHARED_LIBS)
set_target_properties(${the_target} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:atlthunk.lib /NODEFAULTLIB:atlsd.lib /DEBUG")
endif()
install(TARGETS ${the_target} install(TARGETS ${the_target}
RUNTIME DESTINATION "samples/cpp" COMPONENT main) RUNTIME DESTINATION "samples/cpp" COMPONENT main)
endif() endif()

3
samples/gpu/CMakeLists.txt

@ -47,6 +47,9 @@ if (BUILD_EXAMPLES)
endif() endif()
if(WIN32) if(WIN32)
if (MSVC AND NOT BUILD_SHARED_LIBS)
set_target_properties(${the_target} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:atlthunk.lib /NODEFAULTLIB:atlsd.lib /DEBUG")
endif()
install(TARGETS ${the_target} install(TARGETS ${the_target}
RUNTIME DESTINATION "samples/gpu" COMPONENT main) RUNTIME DESTINATION "samples/gpu" COMPONENT main)
endif() endif()