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

formatting

Browse Source
This commit is contained in:
Anatoly Baksheev 2011-05-11 14:45:35 +00:00
parent 429b33de97
commit 7a24dc9cb6
1 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
CMakeLists.txt
View File

@ -252,22 +252,13 @@ if(CMAKE_COMPILER_IS_GNUCXX)
set(USE_FAST_MATH ON CACHE BOOL "Enable -ffast-math for GCC") set(USE_FAST_MATH ON CACHE BOOL "Enable -ffast-math for GCC")
endif() endif()
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES amd64*) if(${CMAKE_SYSTEM_PROCESSOR} MATCHES amd64*|x86_64*)
set(X86_64 1) set(X86_64 1)
endif() endif()
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES x86_64*)
set(X86_64 1) if(${CMAKE_SYSTEM_PROCESSOR} MATCHES i686*|i386*|x86*)
endif()
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES i686*)
set(X86 1) set(X86 1)
endif() endif()
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES i386*)
set(X86 1)
endif()
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES x86*)
set(X86 1)
endif()
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES powerpc*) if(${CMAKE_SYSTEM_PROCESSOR} MATCHES powerpc*)
set(USE_O3 ON CACHE BOOL "Enable -O3 for GCC") set(USE_O3 ON CACHE BOOL "Enable -O3 for GCC")
@ -608,14 +599,14 @@ if (WITH_QT)
#if (NOT WIN32) #if (NOT WIN32)
if (WITH_QT_OPENGL) if (WITH_QT_OPENGL)
if (QT_QTOPENGL_FOUND AND OPENGL_FOUND) if (QT_QTOPENGL_FOUND AND OPENGL_FOUND)
set(HAVE_QT_OPENGL 1) set(HAVE_QT_OPENGL 1)
add_definitions(-DHAVE_QT_OPENGL) add_definitions(-DHAVE_QT_OPENGL)
#link_directories("${OPENGL_LIBRARIES}") #link_directories("${OPENGL_LIBRARIES}")
set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} ${OPENGL_LIBRARIES}) set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} ${OPENGL_LIBRARIES})
endif() endif()
endif() endif()
#endif() #endif()
endif() endif()
endif() endif()
@ -775,12 +766,12 @@ endif()
############################### VideoInput ################################ ############################### VideoInput ################################
if (WIN32 AND WITH_VIDEOINPUT) if (WIN32 AND WITH_VIDEOINPUT)
if(CMAKE_CXX_COMPILER MATCHES "dw2") if(CMAKE_CXX_COMPILER MATCHES "dw2")
else() else()
if(NOT MINGW64) if(NOT MINGW64)
set(HAVE_VIDEOINPUT 1) set(HAVE_VIDEOINPUT 1)
endif() endif()
endif() endif()
endif() endif()
############################### OpenNI ################################ ############################### OpenNI ################################