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

fixed ~300 warnings under windows (had to hack gtest a bit)

Browse Source
This commit is contained in:
Anatoly Baksheev
2011-05-06 21:45:48 +00:00
parent c67f1a2551
commit 1c18e5fef9
25 changed files with 87 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenCVModule.cmake
View File

@@ -2,9 +2,6 @@
macro(define_opencv_module name)
project(opencv_${name})
if (OPENCV_BUILD_SHARED_LIB)
add_definitions(-DCVAPI_EXPORTS)
endif()
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include"
"${CMAKE_CURRENT_SOURCE_DIR}/src"
@@ -38,8 +35,13 @@ macro(define_opencv_module name)
set_target_properties(${the_target} PROPERTIES
VERSION ${OPENCV_VERSION}
SOVERSION ${OPENCV_SOVERSION}
OUTPUT_NAME "${the_target}${OPENCV_DLLVERSION}"
)
OUTPUT_NAME "${the_target}${OPENCV_DLLVERSION}"
)
if (OPENCV_BUILD_SHARED_LIB)
#add_definitions(-DCVAPI_EXPORTS)
set_target_properties(${the_target} PROPERTIES DEFINE_SYMBOL CVAPI_EXPORTS)
endif()
# Additional target properties
set_target_properties(${the_target} PROPERTIES