Bug fixes.

Build_Binary_x86.bat

@@ -106,7 +106,7 @@ SET INTEL_ICL=%ICPP_COMPILER12%bin\ia32\icl.exe
 IF "%OS_MODE%"==" Win64" SET INTEL_ICL=%ICPP_COMPILER12%bin\intel64\icl.exe
 SET INTEL_TBB=%ICPP_COMPILER12%\tbb\include
 IF "%OS_MODE%"==" Win64" SET INTEL_IPP=%ICPP_COMPILER12%redist\intel64\ipp
-SET ICPROJCONVERT=%PROGRAMFILES_DIR_X86%\Common Files\Intel\shared files\ia32\Bin\ICProjConvert121.exe
+REM SET ICPROJCONVERT=%PROGRAMFILES_DIR_X86%\Common Files\Intel\shared files\ia32\Bin\ICProjConvert121.exe
 
 REM initiate the compiler enviroment
 @echo on
@@ -138,7 +138,7 @@ REM Emgu.CV.Extern\libgeotiff\libgeotiff-1.3.0\geotiff_archive.icproj ^
 REM Emgu.CV.Extern\tesseract\libtesseract\tesseract_ccstruct.icproj ^
 REM Emgu.CV.Extern\tesseract\libtesseract\tesseract_wordrec.icproj ^
 REM /VC
-GOTO END
+GOTO BUILD
 
 :VISUAL_STUDIO
 @echo on

Emgu.CV.Extern/CMakeLists.txt

@@ -39,7 +39,7 @@ ENDIF()
 
 ############################### IPP START ##############################
 IF(WITH_IPP)
-  include(${PROJECT_SOURCE_DIR}/../opencv/cmake/OpenCVFindIPP.cmake)
+  include(${OPENCV_SUBFOLDER}/cmake/OpenCVFindIPP.cmake)
   IF (IPP_FOUND)
     message(STATUS "CVEXTERN: USING IPP: ${IPP_LIBRARY_DIRS} ")
     add_definitions(-DHAVE_IPP)

miscellaneous/0001-patch-opencv-for-emgucv.patch

@@ -1,4 +1,4 @@
-From caeed7265974831b49ac27b85b6c9ed782e8a380 Mon Sep 17 00:00:00 2001
+From 59d9b04692bbf80ad8eac18bb02a98c5246ddd0f Mon Sep 17 00:00:00 2001
 From: Canming Huang <support@emgu.com>
 Date: Wed, 25 Jul 2012 13:13:42 -0400
 Subject: [PATCH] patch opencv for emgucv.
@@ -10,7 +10,7 @@ Subject: [PATCH] patch opencv for emgucv.
  opencv/3rdparty/libtiff/CMakeLists.txt             |    4 ++++
  opencv/3rdparty/zlib/CMakeLists.txt                |    4 ++++
  opencv/cmake/OpenCVDetectTBB.cmake                 |   20 +++++++++++++------
- opencv/cmake/OpenCVModule.cmake                    |    6 +++++-
+ opencv/cmake/OpenCVModule.cmake                    |    8 ++++++--
  opencv/modules/contrib/src/colormap.cpp            |    1 +
  opencv/modules/core/src/drawing.cpp                |   14 ++++++-------
  opencv/modules/gpu/src/match_template.cpp          |    2 +-
@@ -20,7 +20,7 @@ Subject: [PATCH] patch opencv for emgucv.
  opencv/modules/highgui/src/cap_openni.cpp          |    8 ++++++++
  opencv/modules/legacy/src/3dtracker.cpp            |    6 +++---
  opencv/modules/objdetect/src/latentsvm.cpp         |    2 +-
- 16 files changed, 73 insertions(+), 37 deletions(-)
+ 16 files changed, 74 insertions(+), 38 deletions(-)
 
 diff --git a/opencv/3rdparty/libjasper/CMakeLists.txt b/opencv/3rdparty/libjasper/CMakeLists.txt
 index 5b850c9..46ce17f 100644
@@ -129,7 +129,7 @@ index c37a8c3..37a8e33 100644
            set(_TBB_LIB_PATH "${_TBB_LIB_PATH}/vc8")
          elseif(MSVC90)
 diff --git a/opencv/cmake/OpenCVModule.cmake b/opencv/cmake/OpenCVModule.cmake
-index 543f997..2274e40 100644
+index 543f997..29825e8 100644
 --- a/opencv/cmake/OpenCVModule.cmake
 +++ b/opencv/cmake/OpenCVModule.cmake
 @@ -460,6 +460,10 @@ macro(ocv_create_module)
@@ -143,15 +143,17 @@ index 543f997..2274e40 100644
    # For dynamic link numbering convenions
    if(NOT ANDROID)
      # Android SDK build scripts can include only .so files into final .apk
-@@ -486,7 +490,7 @@ macro(ocv_create_module)
+@@ -486,8 +490,8 @@ macro(ocv_create_module)
    endif()
  
    install(TARGETS ${the_module}
 -    RUNTIME DESTINATION bin COMPONENT main
+-    LIBRARY DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT main
 +    RUNTIME DESTINATION bin${UNMANAGED_LIBRARY_OUTPUT_SUBFOLDER} COMPONENT main
-     LIBRARY DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT main
++    LIBRARY DESTINATION bin${UNMANAGED_LIBRARY_OUTPUT_SUBFOLDER} COMPONENT main
      ARCHIVE DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT main
      )
+ 
 diff --git a/opencv/modules/contrib/src/colormap.cpp b/opencv/modules/contrib/src/colormap.cpp
 index bb317f7..867e534 100644
 --- a/opencv/modules/contrib/src/colormap.cpp

tests/cvextern_test/CMakeLists.txt

@@ -26,7 +26,7 @@ INCLUDE_DIRECTORIES("${PROJECT_SOURCE_DIR}/../../Emgu.CV.Extern/")
 
 ############################### IPP START ##############################
 IF(WITH_IPP)
-include(${PROJECT_SOURCE_DIR}/../../opencv/cmake/OpenCVFindIPP.cmake)
+include(${OPENCV_SUBFOLDER}/cmake/OpenCVFindIPP.cmake)
   IF (IPP_FOUND)
     message(STATUS "CVEXTERN: USING IPP: ${IPP_LIBRARY_DIRS} ")
     add_definitions(-DHAVE_IPP)