Fixed CMakeLists.txt

shimat · Oct 17, 2014 · 83caebd · 83caebd
1 parent eedd38f
commit 83caebd
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 94 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,27 +1,7 @@
-# Copyright (C) 2009 by Schima
-# schimatk@gmail.com
-#
-# OpenCvSharp is free software: you can redistribute it and/or modify
-# it under the terms of the Lesser GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OpenCvSharp is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# Lesser GNU General Public License for more details.
-#
-# You should have received a copy of the Lesser GNU General Public License
-# along with OpenCvSharp.  If not, see <http://www.gnu.org/licenses/>.
-
-cmake_minimum_required(VERSION 2.0)
-
+cmake_minimum_required(VERSION 2.4)
 
 project(OpenCvSharpExtern)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
 
 add_subdirectory(OpenCvSharpExtern) 
-
-
-
diff --git a/src/OpenCvSharp.SandboxCpp/OpenCvSharp.SandboxCpp.vcxproj b/src/OpenCvSharp.SandboxCpp/OpenCvSharp.SandboxCpp.vcxproj
@@ -80,13 +80,15 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <LibraryPath>C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Lib;$(LibraryPath)</LibraryPath>
+    <LibraryPath>C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Lib;D:\lib\OpenCV\2.4.9\build\x86\vc11\lib;$(LibraryPath)</LibraryPath>
     <OutDir>$(SolutionDir)$(Configuration)\$(PlatformName)\</OutDir>
+    <IncludePath>D:\lib\OpenCV\2.4.9\build\include;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <LibraryPath>$(LibraryPath)</LibraryPath>
+    <LibraryPath>D:\lib\OpenCV\2.4.9\build\x64\vc11\lib;$(LibraryPath)</LibraryPath>
     <OutDir>$(SolutionDir)$(Configuration)\$(PlatformName)\</OutDir>
+    <IncludePath>D:\lib\OpenCV\2.4.9\build\include;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>

diff --git a/src/OpenCvSharpExtern/CMakeLists.txt b/src/OpenCvSharpExtern/CMakeLists.txt
@@ -1,75 +1,27 @@
-# Copyright (C) 2009 by Schima
-# schimatk@gmail.com
-#
-# OpenCvSharp is free software: you can redistribute it and/or modify
-# it under the terms of the Lesser GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OpenCvSharp is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# Lesser GNU General Public License for more details.
-#
-# You should have received a copy of the Lesser GNU General Public License
-# along with OpenCvSharp.  If not, see <http://www.gnu.org/licenses/>.
-
-#find_package(OpenCV REQUIRED)
 
 include_directories(${OpenCV_INCLUDE_DIR})
 link_directories(${OpenCV_LIBRARY_DIR} ${OpenCV_LIBRARIES})
 
-set(OPENCVSHARP_FILES  
-	CvANN_MLP.cpp
-	CvBlobWrapper.cpp
-	CvBoost.cpp
-	CvDTree.cpp
-	CvEM.cpp
-	CvERTrees.cpp
-	CvKNearest.cpp
-	CvMLData.cpp
-	CvNormalBayesClassifier.cpp
-	CvRTrees.cpp
-	CvSVM.cpp
-	CvStatModel.cpp
-	CvTrainTestSplit.cpp
-	WAlgorithm.cpp
-	WCore.cpp
-	WCv.cpp
-	WCvAdaptiveSkinDetector.cpp
-	WCvCamShiftTracker.cpp
-	WCvaux.cpp
-	WFlann.cpp
-	WHOGDescriptor.cpp
-	WHighgui.cpp
-	WMat.cpp
-	#WMatND.cpp
-	WNonfree.cpp
-	WStereoSGBM.cpp
-	WVector.cpp
-	WVideo.cpp
-	cvaux.cpp
-	cvblob.cpp
-	cvcolor.cpp
-	cvcontour.cpp
-	cvlabel.cpp
-	cvtrack.cpp
+set(OPENCVSHARP_FILES 
+	calib3d.cpp
+	contrib.cpp
+	core.cpp
+	features2d.cpp
+	flann.cpp
+	gpu.cpp
+	highgui.cpp
+	imgproc.cpp
+	legacy.cpp
+	ml.cpp
+	nonfree.cpp
+	objdetect.cpp
+	photo.cpp
+	std_vector.cpp
+	stitching.cpp
+	superres.cpp
+	video.cpp
 )
 
-#set(OPENCVSHARP_FILES  cvblob.cpp
-#                       cvlabel.cpp
-#                       CvANN_MLP.cpp 
-#                       CvBlobWrapper.cpp
-#                       CvBoost.cpp 
-#                       CvDTree.cpp 
-#                       CvEM.cpp 
-#                       CvKNearest.cpp 
-#                       CvNormalBayesClassifier.cpp 
-#                       CvRTrees.cpp 
-#                       CvStatModel.cpp 
-#                       CvSVM.cpp
-#)
-
 add_library(OpenCvSharpExtern SHARED ${OPENCVSHARP_FILES})
 
 install(TARGETS OpenCvSharpExtern

diff --git a/src/OpenCvSharpExtern/OpenCvSharpExtern.vcxproj b/src/OpenCvSharpExtern/OpenCvSharpExtern.vcxproj
@@ -77,12 +77,12 @@
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
     <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IncludePath)</IncludePath>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IncludePath)</IncludePath>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">D:\lib\OpenCV\2.4.9\build\include;$(IncludePath)</IncludePath>
     <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(LibraryPath)</LibraryPath>
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(LibraryPath)</LibraryPath>
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">D:\lib\OpenCV\2.4.9\build\x64\vc11\lib;$(LibraryPath)</LibraryPath>
     <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IncludePath)</IncludePath>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IncludePath)</IncludePath>
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Lib;$(LibraryPath)</LibraryPath>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">D:\lib\OpenCV\2.4.9\build\include;$(IncludePath)</IncludePath>
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Lib;D:\lib\OpenCV\2.4.9\build\x86\vc11\lib;$(LibraryPath)</LibraryPath>
     <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

diff --git a/src/OpenCvSharpExtern/gpu_ORB_GPU.h b/src/OpenCvSharpExtern/gpu_ORB_GPU.h
@@ -52,7 +52,7 @@ CVAPI(void) gpu_ORB_GPU_convertKeyPoints(ORB_GPU *obj, cv::Mat *h_keypoints, std
 
 CVAPI(int) gpu_ORB_GPU_descriptorSize(ORB_GPU *obj)
 {
-    obj->descriptorSize();
+    return obj->descriptorSize();
 }
 
 CVAPI(void) gpu_ORB_GPU_release(ORB_GPU *obj)