Просмотр исходного кода

cmake cleanup of temporary files

Johannes Ruehle 12 лет назад
Родитель
Сommit
4cc338c4f3

+ 0 - 12
core/algebra/CMakeLists.t.txt

@@ -1,12 +0,0 @@
-if(BUILD_CORE_ALGEBRA)
-ocv_add_module(algebra INTERNAL nice_core_basics)
-
-
-ocv_clear_vars(ADDITIONAL_CORE_ALGEBRA_LIBS)
-if(IPP_FOUND) #NICE_USELIB_IPP
-endif()
-
-ocv_module_include_directories()
-ocv_glob_module_sources()
-ocv_create_module()
-endif()

+ 0 - 16
core/algebra/progs/CMakeLists.txt

@@ -1,16 +0,0 @@
-if(BUILD_CORE_PROGS)
-
-ADD_EXECUTABLE(testILSConjugateGradients testILSConjugateGradients.cpp)
-ADD_EXECUTABLE(testILSmethods testILSmethods.cpp)
-#ADD_EXECUTABLE(testMemoryUsage testMemoryUsage.cpp) 
-
-#message(STATUS "boost_Libraries: ${Boost_LIBRARIES}")
-TARGET_LINK_LIBRARIES(testILSConjugateGradients nice_core ${Boost_LIBRARIES})#nice_core_algebra nice_core_basics ${Boost_LIBRARIES})
-TARGET_LINK_LIBRARIES(testILSmethods nice_core ${Boost_LIBRARIES})#nice_core_algebra nice_core_basics ${Boost_LIBRARIES})
-#TARGET_LINK_LIBRARIES(testMemoryUsage libnice_core_basics libnice_core_vector)
-
-INSTALL(TARGETS testILSConjugateGradients DESTINATION bin)
-INSTALL(TARGETS testILSmethods DESTINATION bin)
-#INSTALL(TARGETS testMemoryUsage DESTINATION bin)
-
-endif()

+ 0 - 14
core/basics/CMakeLists.t.txt

@@ -1,14 +0,0 @@
-if(BUILD_CORE_BASICS)
-#message(STATUS "vector_location: ${OPENCV_MODULE_opencv_vector_LOCATION}")
-
-ocv_add_module(basics)# ${Boost_LIBRARIES})# INTERNAL libnice_core_vector)
-
-#message(STATUS "vector_location: ${OPENCV_MODULE_vector_LOCATION}")
-
-ocv_module_include_directories()#${Boost_INCLUDE_DIR})
-#message(STATUS "vec-sources: ${OPENCV_MODULE_libnice_core_vector_SOURCES}")
-ocv_glob_module_sources()#(SOURCES ${OPENCV_MODULE_libnice_core_vector_SOURCES})
-ocv_create_module()
-
-#add_subdirectory(progs bin)
-endif()

+ 0 - 15
core/basics/CMakeLists.txt.old

@@ -1,15 +0,0 @@
-SET(core_basics_src Config.cpp BinStreamable.cpp  FastMath.cpp          gzstream.cpp      Observer.cpp            stringutils.cpp
-bzstream.cpp       FileMgt.cpp           Log.cpp           ResourceStatistics.cpp  Timer.cpp
-Config.cpp         FileName.cpp          numerictools.cpp  Streamable.cpp          tools.cpp
-Exception.cpp      FrameRateCounter.cpp  Observable.cpp    StringTools.cpp
-)
-
-message(STATUS "vector sources: ${core_vectors_src}")
-ADD_LIBRARY(core_basics ${NICE_BUILD_LIBS_STATIC_SHARED} ${core_basics_src} ${core_vectors_src})
-#TARGET_LINK_LIBRARIES(core_basics core_vector)
-
-#add_dependencies(core_basics core_vectors)
-
-ADD_SUBDIRECTORY(progs)
-
-INSTALL(TARGETS core_basics DESTINATION libs)

+ 0 - 12
core/basics/progs/CMakeLists.txt

@@ -1,12 +0,0 @@
-if(BUILD_CORE_PROGS)
-
-ADD_EXECUTABLE(testConfig testConfig.cpp)
-ADD_EXECUTABLE(testMemoryUsage testMemoryUsage.cpp) 
-
-TARGET_LINK_LIBRARIES(testConfig nice_core_basics)
-TARGET_LINK_LIBRARIES(testMemoryUsage nice_core_basics)
-
-INSTALL(TARGETS testConfig DESTINATION bin)
-INSTALL(TARGETS testMemoryUsage DESTINATION bin)
-
-endif()

+ 0 - 42
core/image/CMakeLists.t.txt

@@ -1,42 +0,0 @@
-if(BUILD_CORE_IMAGE)
-#message(STATUS "vector_location: ${OPENCV_MODULE_opencv_vector_LOCATION}")
-
-ocv_add_module(image)# ${Boost_LIBRARIES})# INTERNAL libnice_core_vector)
-
-ocv_clear_vars(ADDITIONAL_CORE_IMAGE_LIBS)
-if(IMAGEMAGIC_FOUND) #NICE_USELIB_LIBMAGICK
-endif()
-
-if(WITH_PNG OR WITH_TIFF OR WITH_OPENEXR)
-  #ocv_include_directories(${ZLIB_INCLUDE_DIR})
-  #list(APPEND GRFMT_LIBS ${ZLIB_LIBRARIES})
-endif()
-
-if(WITH_JPEG)
-  #add_definitions(-DHAVE_JPEG)
-  #ocv_include_directories(${JPEG_INCLUDE_DIR})
-  #list(APPEND GRFMT_LIBS ${JPEG_LIBRARIES})
-endif()
-
-if(WITH_PNG)
-  #add_definitions(-DHAVE_PNG)
-  #add_definitions(${PNG_DEFINITIONS})
-  #ocv_include_directories(${PNG_INCLUDE_DIR})
-  #list(APPEND GRFMT_LIBS ${PNG_LIBRARIES})
-endif()
-
-if(WITH_TIFF)
-  #add_definitions(-DHAVE_TIFF)
-  #ocv_include_directories(${TIFF_INCLUDE_DIR})
-  #list(APPEND GRFMT_LIBS ${TIFF_LIBRARIES})
-endif()
-
-#message(STATUS "vector_location: ${OPENCV_MODULE_vector_LOCATION}")
-
-ocv_module_include_directories()#${Boost_INCLUDE_DIR})
-#message(STATUS "vec-sources: ${OPENCV_MODULE_libnice_core_vector_SOURCES}")
-ocv_glob_module_sources()#(SOURCES ${OPENCV_MODULE_libnice_core_vector_SOURCES})
-ocv_create_module()
-
-#add_subdirectory(progs bin)
-endif()

+ 0 - 52
core/image/CMakeLists.txt.old

@@ -1,52 +0,0 @@
-set( core_image_src Algorithms.cpp
-BlockImageAccessT.tcc
-Buffer.tcc
-CircleT.tcc
-ColorImageAccess.cpp
-ColorImageT.cpp
-ColorImageT.tcc
-ColorT.tcc
-Convert.cpp
-Convert.tcc
-CrossT.tcc
-DeprecatedConverter.cpp
-DeprecatedConverter.tcc
-EllipseT.tcc
-Filter.cpp
-Filter.tcc
-FilterT.cpp
-FilterT.tcc
-Fourier.cpp
-GaussPyramid.cpp
-GHough.cpp
-GrayColorImageCommonImplementation.cpp
-GrayColorImageCommonImplementationT.tcc
-Histogram.cpp
-ImageAccess.cpp
-ImageAccessT.tcc
-ImageFile.cpp
-ImageFileListReader.cpp
-ImageFileListWriter.cpp
-ImageFile.tcc
-ImageInputStream.cpp
-ImageOutputStream.cpp
-ImageT.cpp
-ImageTools.cpp
-ImageTools.tcc
-ImageT.tcc
-ippwrapper.tcc
-LineT.tcc
-Morph.cpp
-Morph.tcc
-MultiChannelImageT.cpp
-MultiChannelImageT.tcc
-Pixel.tcc
-PointT.tcc
-RectangleT.tcc
-RectT.tcc
-Region.cpp
-)
-
-ADD_LIBRARY(core_image ${NICE_BUILD_LIBS_STATIC_SHARED} ${core_image_src})
-
-INSTALL(TARGETS core_image DESTINATION libs)

+ 0 - 12
core/image/progs/CMakeLists.txt

@@ -1,12 +0,0 @@
-if(BUILD_CORE_PROGS)
-
-ADD_EXECUTABLE(testApproxGaussFilter testApproxGaussFilter.cpp)
-#ADD_EXECUTABLE(testGenericSobelFilter testGenericSobelFilter.cpp)
-
-TARGET_LINK_LIBRARIES(testApproxGaussFilter nice_core nice_core_image ${Boost_LIBRARIES} ${ImageMagick_LIBRARIES} ${PNG_LIBRARIES} )#nice_core_algebra nice_core_basics ${Boost_LIBRARIES})
-#TARGET_LINK_LIBRARIES(testGenericSobelFilter nice_core ${Boost_LIBRARIES})#nice_core_algebra nice_core_basics ${Boost_LIBRARIES})
-
-INSTALL(TARGETS testApproxGaussFilter DESTINATION bin)
-#INSTALL(TARGETS testGenericSobelFilter DESTINATION bin)
-
-endif()

+ 0 - 7
core/matlabAccess/CMakeLists.t.txt

@@ -1,7 +0,0 @@
-if(BUILD_CORE_MATLABACCESS)
-ocv_add_module(matlabAccess)
-
-ocv_module_include_directories()
-ocv_glob_module_sources()
-ocv_create_module()
-endif()

+ 0 - 13
core/optimization/CMakeLists.t.txt

@@ -1,13 +0,0 @@
-if(BUILD_CORE_OPTIMIZATION)
-#get_filename_component(currDirName ${CMAKE_CURRENT_SOURCE_DIR} NAME )
-#set(the_module "${the_module}_${currDirName}")
-
-#add_subdirectory(blackbox)
-#add_subdirectory(gradientBased)
-
-ocv_add_module(optimization)
-
-ocv_module_include_directories()
-ocv_glob_module_sources()
-ocv_create_module()
-endif()

+ 0 - 5
core/optimization/blackbox/CMakeLists.txt

@@ -1,5 +0,0 @@
-ocv_add_module(blackbox)
-
-ocv_module_include_directories()
-ocv_glob_module_sources()
-ocv_create_module()

+ 0 - 5
core/optimization/gradientBased/CMakeLists.txt

@@ -1,5 +0,0 @@
-ocv_add_module(gradientBased)
-
-ocv_module_include_directories()
-ocv_glob_module_sources()
-ocv_create_module()

+ 0 - 48
core/vector/CMakeLists.t.txt

@@ -1,48 +0,0 @@
-if(BUILD_CORE_VECTOR)
-
-ocv_add_module(vector)
-
-
-ocv_clear_vars(ADDITIONAL_CORE_VECTOR_LIBS)
-
-if(OPENMP_FOUND)#NICE_USELIB_OPENMP
-  set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
-  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
-  ADD_DEFINITIONS( "-DNICE_USELIB_OPENMP" )
-  ocv_include_directories(${OpenMP_INCLUDE_DIR})
-  #list(APPEND ADDITIONAL_CORE_VECTOR_LIBS ${PNG_LIBRARIES})
-endif()
-
-if(IPP_FOUND) #NICE_USELIB_IPP
-endif()
-
-if(LINAL_FOUND) #NICE_USELIB_LINAL
-endif()
-
-if(ZLIB_FOUND)#NICE_USELIB_ZLIB
-endif()
-
-if(BZLIB_FOUND)#NICE_USELIB_BZLIB //in test/TestSTreamable.cpp
-endif()
-
-if(CPPUNIT_FOUND)#NICE_USELIB_CPPUNIT
-endif()
-
-ocv_module_include_directories()
-ocv_glob_module_sources()
-
-#ocv_create_module(  ) 
-
-ocv_create_module(${ADDITIONAL_CORE_VECTOR_LIBS})
-
-if(MSVC)
-  if(NOT ENABLE_NOISY_WARNINGS)
-    ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4996)
-  endif()
-endif()
-#add_subdirectory(progs bin)
-
-
-
-endif()
-

+ 0 - 16
core/vector/CMakeLists.txt.old

@@ -1,16 +0,0 @@
-SET(core_vector_src Algorithms.cpp Algorithms.tcc
-Distance.cpp
-Distance.tcc
-Eigen.tcc
-ippwrapper.cpp
-ippwrapper.tcc
-MatrixT.tcc
-RowMatrixT.tcc
-SparseVectorT.tcc
-VectorT.tcc
-VVector.cpp
-)
-
-ADD_LIBRARY(core_vector ${NICE_BUILD_LIBS_STATIC_SHARED} ${core_vector_src})
-
-INSTALL(TARGETS core_vector DESTINATION libs)