Learn how easy it is to sync an existing GitHub or Google Code repo to a SourceForge project! See Demo

Close

Commit [008237] gsoc2010_patent_free_cpm Maximize Restore History

Files added and removed to reorganize directories.

Antoine Antoine 2010-06-01

1 2 3 .. 15 > >> (Page 1 of 15)
removed src/libpanomatic/CMakeModules
removed src/libpanomatic/CMakeModules/FindPNG.cmake
removed src/libpanomatic/CMakeModules/FindVIGRA.cmake
removed src/libpanomatic/CMakeModules/FindTIFF.cmake
removed src/libpanomatic/CMakeModules/FindJPEG.cmake
removed src/libpanomatic/tclap
removed src/libpanomatic/tclap/VersionVisitor.h
removed src/libpanomatic/tclap/SwitchArg.h
removed src/libpanomatic/tclap/ValuesConstraint.h
removed src/libpanomatic/tclap/CmdLine.h
removed src/libpanomatic/tclap/UnlabeledValueArg.h
removed src/libpanomatic/tclap/IgnoreRestVisitor.h
removed src/libpanomatic/tclap/UnlabeledMultiArg.h
removed src/libpanomatic/tclap/MultiArg.h
removed src/libpanomatic/tclap/Visitor.h
removed src/libpanomatic/tclap/MultiSwitchArg.h
removed src/libpanomatic/tclap/CmdLineInterface.h
removed src/libpanomatic/tclap/CmdLineOutput.h
removed src/libpanomatic/tclap/Constraint.h
removed src/libpanomatic/tclap/HelpVisitor.h
removed src/libpanomatic/tclap/XorHandler.h
copied src/libpanomatic/CMakeModules/FindZLIB.cmake -> src/libpanomatic/localfeatures/CMakeLists.txt~
copied src/libpanomatic/CMakeModules/FindBoostPython.cmake -> CMakeModules/FindBoostPython.cmake
src/libpanomatic/CMakeModules
File was removed.
src/libpanomatic/tclap
File was removed.
src/libpanomatic/CMakeModules/FindZLIB.cmake to src/libpanomatic/localfeatures/CMakeLists.txt~
--- a/src/libpanomatic/CMakeModules/FindZLIB.cmake
+++ b/src/libpanomatic/localfeatures/CMakeLists.txt~
@@ -1,39 +1,33 @@
-# - Modified Find zlib
-# Added to support Windows build but should work anywhere.
-#
-# Find the native ZLIB includes and library
-#
-#  ZLIB_INCLUDE_DIR - where to find zlib.h, etc.
-#  ZLIB_LIBRARIES   - List of libraries when using zlib.
-#  ZLIB_FOUND       - True if zlib found.
+#if (ENABLE_SURF)
+#  set(SURF_SRC SurfKeyPointDescriptor.cpp)
+#  set(SURF_HEADER SurfKeyPointDescriptor.h)
+#endif (ENABLE_SURF)
+  
+  # the liblocalfeature library
+set (LF_SRC  RansacFiltering.cpp Homography.cpp Image.cpp
+             ${SURF_SRC} CircularKeyPointDescriptor.cpp
+	     KeyPointDetector.cpp KeyPointIO.cpp MathStuff.cpp)
 
-FIND_PATH(ZLIB_INCLUDE_DIR zlib.h
-  /usr/local/include
-  /usr/include
-  ${SOURCE_BASE_DIR}/zlib
-)
+set (LF_HEADER BoundedSet.h BoxFilter.h CircularKeyPointDescriptor.h
+               ${SURF_HEADER} Homography.h Image.h KeyPoint.h KeyPointDescriptor.h
+               KeyPointDetector.h KeyPointIO.h MathStuff.h
+               PointMatch.h RansacFiltering.h Sieve.h WaveFilter.h )
 
-FIND_LIBRARY(ZLIB_LIBRARIES
-  NAMES z zlib zlib1
-  PATHS /usr/lib /usr/local/lib ${SOURCE_BASE_DIR}/zlib
-)
-
+add_library(localfeatures SHARED ${LF_SRC} ${LF_HEADER})
+ 
 IF(WIN32)
-  FIND_FILE(ZLIB_DLL
-    NAMES zlib1.dll 
-    PATHS ${SOURCE_BASE_DIR}/zlib
-    NO_SYSTEM_ENVIRONMENT_PATH
-  )
+  INSTALL(TARGETS localfeatures DESTINATION ${BINDIR})
+ELSE(WIN32)
+  INSTALL(TARGETS localfeatures DESTINATION ${LIBDIR})
 ENDIF(WIN32)
 
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZLIB  DEFAULT_MSG  ZLIB_INCLUDE_DIR ZLIB_LIBRARIES )
+# install headers (for development)
+INSTALL(FILES  ${LF_HEADER} DESTINATION ${INCDIR}/localfeatures)
 
-IF (ZLIB_FOUND)
-	MESSAGE(STATUS "Found zlib include dir: ${ZLIB_INCLUDE_DIR}")
-    MESSAGE(STATUS "Found zlib library: ${ZLIB_LIBRARIES}")
-ELSE (ZLIB_FOUND)
-	MESSAGE(FATAL_ERROR "Could not find zlib")
-ENDIF (ZLIB_FOUND)
-
-MARK_AS_ADVANCED(ZLIB_LIBRARIES ZLIB_INCLUDE_DIR)
+# the python interface for it
+# temporarily disabled, it is not working anyway.
+#IF (BOOST_PYTHON_FOUND)
+#  add_library(pylf SHARED python_wrapper.cpp)
+#  SET_TARGET_PROPERTIES(pylf PROPERTIES PREFIX "")
+#  TARGET_LINK_LIBRARIES(pylf ${BOOST_PYTHON_LIBS} localfeatures)
+#ENDIF (BOOST_PYTHON_FOUND)
1 2 3 .. 15 > >> (Page 1 of 15)