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

On branch gtk3

Browse Source 
Changes to be committed:
	modified:   CMakeLists.txt
Corrected merge error from last resync
This commit is contained in:
Tony 2014-06-03 21:29:54 +01:00
parent bd12d64641
commit f0887a99e2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -923,11 +923,11 @@ endif(DEFINED WITH_INTELPERC)
status("")
status(" Other third-party libraries:")
if((WITH_IPP OR WITH_ICV) AND HAVE_IPP)
if(WITH_IPP AND HAVE_IPP)
status(" Use IPP:" "${IPP_VERSION_STR} [${IPP_VERSION_MAJOR}.${IPP_VERSION_MINOR}.${IPP_VERSION_BUILD}]")
status(" at:" "${IPP_ROOT_DIR}")
else()
status(" Use IPP:" (WITH_IPP OR WITH_ICV) AND NOT HAVE_IPP THEN "IPP not found" ELSE NO)
status(" Use IPP:" WITH_IPP AND NOT HAVE_IPP THEN "IPP not found" ELSE NO)
endif()
if(DEFINED WITH_IPP_A)