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

Fix build warnings on MSVC x64 and OS X clang

Browse Source
This commit is contained in:
Andrey Kamaev 2013-03-01 12:17:05 +04:00
parent a910360689
commit 22d33373fa
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/OpenCVCompilerOptions.cmake
View File

@ -97,7 +97,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
endif() endif()
# We need pthread's # We need pthread's
if(UNIX AND NOT ANDROID) if(UNIX AND NOT ANDROID AND NOT (APPLE AND CMAKE_COMPILER_IS_CLANGCXX))
add_extra_compiler_option(-pthread) add_extra_compiler_option(-pthread)
endif() endif()

22
cmake/OpenCVDetectCXXCompiler.cmake
View File

@ -5,17 +5,17 @@ if(CMAKE_CL_64)
set(MSVC64 1) set(MSVC64 1)
endif() endif()
if(NOT APPLE) if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") set(CMAKE_COMPILER_IS_GNUCXX 1)
set(CMAKE_COMPILER_IS_GNUCXX 1) set(CMAKE_COMPILER_IS_CLANGCXX 1)
set(CMAKE_COMPILER_IS_CLANGCXX 1) endif()
set(ENABLE_PRECOMPILED_HEADERS OFF CACHE BOOL "" FORCE) if(CMAKE_C_COMPILER_ID STREQUAL "Clang")
endif() set(CMAKE_COMPILER_IS_GNUCC 1)
if(CMAKE_C_COMPILER_ID STREQUAL "Clang") set(CMAKE_COMPILER_IS_CLANGCC 1)
set(CMAKE_COMPILER_IS_GNUCC 1) endif()
set(CMAKE_COMPILER_IS_CLANGCC 1)
set(ENABLE_PRECOMPILED_HEADERS OFF CACHE BOOL "" FORCE) if((CMAKE_COMPILER_IS_CLANGCXX OR CMAKE_COMPILER_IS_CLANGCC) AND NOT CMAKE_GENERATOR MATCHES "Xcode")
endif() set(ENABLE_PRECOMPILED_HEADERS OFF CACHE BOOL "" FORCE)
endif() endif()
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------

2
samples/c/smiledetect.cpp
View File

@ -230,7 +230,7 @@ void detectAndDraw( Mat& img, CascadeClassifier& cascade,
// The number of detected neighbors depends on image size (and also illumination, etc.). The // The number of detected neighbors depends on image size (and also illumination, etc.). The
// following steps use a floating minimum and maximum of neighbors. Intensity thus estimated will be // following steps use a floating minimum and maximum of neighbors. Intensity thus estimated will be
//accurate only after a first smile has been displayed by the user. //accurate only after a first smile has been displayed by the user.
const int smile_neighbors = nestedObjects.size(); const int smile_neighbors = (int)nestedObjects.size();
static int max_neighbors=-1; static int max_neighbors=-1;
static int min_neighbors=-1; static int min_neighbors=-1;
if (min_neighbors == -1) min_neighbors = smile_neighbors; if (min_neighbors == -1) min_neighbors = smile_neighbors;