check_include_file not found (Bugfix #2820)


Added by Hans Meine about 12 years ago. Updated almost 12 years ago.


Status:Done Start date:2013-02-21
Priority:Normal Due date:
Assignee:Andrey Kamaev % Done:

0%

Category:build/install
Target version:2.4.5
Affected version:2.4.3 Operating System:
Difficulty: HW Platform:
Pull request:https://github.com/Itseez/opencv/pull/755

Description

We needed to make the following change in order to fix a cmake error:

Index: source/cmake/OpenCVFindLibsGrfmt.cmake
===================================================================
--- source/cmake/OpenCVFindLibsGrfmt.cmake      (Revision 1919)
+++ source/cmake/OpenCVFindLibsGrfmt.cmake      (Arbeitskopie)
@@ -116,6 +116,7 @@
   else()
     include(FindPNG)
     if(PNG_FOUND)
+      include(CheckIncludeFile)
       check_include_file("${PNG_PNG_INCLUDE_DIR}/png.h"        HAVE_PNG_H)
       check_include_file("${PNG_PNG_INCLUDE_DIR}/libpng/png.h" HAVE_LIBPNG_PNG_H)
       if(HAVE_PNG_H)

Similar lines appear in libtiff/openexr/zlib directories, and in the main CMakeLists.txt, but there it is in an if(UNIX) block (for local use for alloca.h etc.).


Related issues

duplicated by Bug #2932: opencv-2.4.4a fails to build with user-defined libpng Cancelled 2013-04-01

Associated revisions

Revision bf3264b1
Added by Andrey Kamaev almost 12 years ago

Add missed CMake include for check_include_file

Issue #2820

Revision 47f1026c
Added by Alexander Alekhin almost 11 years ago

Merge pull request #2820 from ilya-lavrenov:tapi_flip

History

Updated by Anna Kogan about 12 years ago

Hello Hans,

Thank you for reporting the issue! Again, could you please make a pull request with this fix in our repo?

  • Description changed from We needed to make the following change in order to fix a cmake error: Index:... to We needed to make the following change in order to fix a cmake error: <pre... More

Updated by Kirill Kornyakov about 12 years ago

  • Tracker changed from Bug to Bugfix

Updated by Andrey Kamaev almost 12 years ago

  • Pull request set to https://github.com/Itseez/opencv/pull/755
  • Target version set to 2.4.5

Updated by Andrey Kamaev almost 12 years ago

Fix is pushed to 2.4

  • Status changed from Open to Done

Also available in: Atom PDF