FIX: removed externals dependencies

Visillect · Nov 9, 2018 · 65b45a3 · 65b45a3
1 parent b8cd818
commit 65b45a3
Show file tree

Hide file tree

Showing 23 changed files with 17 additions and 269 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -36,7 +36,6 @@ include(cmake/compiler.cmake)
 include(cmake/options.cmake)
 include(cmake/arch.cmake)
 include(cmake/func_macro.cmake)
-include(cmake/svn_external.cmake)
 
 # global include directories
 include_directories(vi_packages)
@@ -46,14 +45,6 @@ include_directories(thirdparty)
 # include_directories(tools)
 # include_directories(sandbox)
 
-# Sort of ad-hoc include paths.
-# include_directories(prj.thirdparty/tbb/include)
-# include_directories(prj.thirdparty/protobuf/src)
-# include_directories(prj.thirdparty/yajl/src/api)
-# include_directories(prj.thirdparty/zlib/src)
-# include_directories(prj.thirdparty/gtest)
-# include_directories(${CMAKE_CURRENT_BINARY_DIR}/prj.thirdparty/yajl/include)
-
 # output directories
 set(SEGM_BINARY_PATH ${CMAKE_BINARY_DIR}/segmentation)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${SEGM_BINARY_PATH}/bin.${SEGMENTATION_ARCH}.debug)

diff --git a/cmake/svn_external.cmake b/cmake/svn_external.cmake
diff --git a/minsubsystem/CMakeLists.txt b/minsubsystem/CMakeLists.txt
@@ -1,16 +1,11 @@
-include_directories(${CMAKE_BINARY_DIR}/thirdparty/libtiff)
-include_directories(${CMAKE_BINARY_DIR}/thirdparty/libpng)
-
-set(MINIMGPRC_DISABLE_RARELY_USED_FUNCTIONS OFF CACHE BOOL "Don't compile rarely used functions -- override" FORCE)
-
 if (NOT MSVC)
   set(WITH_SYSTEM_PNG ON CACHE BOOL "")
 endif()
 
 disable_all_warnings()
 
-svn_external(DIR minbase URL https://vis.iitp.ru/svn/se/packages/minbase/trunk@28189)
-svn_external(DIR mingeo URL https://vis.iitp.ru/svn/se/packages/mingeo/trunk@28189)
-svn_external(DIR minimgapi URL https://vis.iitp.ru/svn/se/packages/minimgapi/trunk@28189)
-svn_external(DIR minimgio URL https://vis.iitp.ru/svn/se/packages/minimgio/trunk@30426)
-svn_external(DIR minutils URL https://vis.iitp.ru/svn/se/packages/minutils/trunk@28189)
+add_subdirectory(minbase)
+add_subdirectory(mingeo)
+add_subdirectory(minimgapi)
+add_subdirectory(minimgio)
+add_subdirectory(minutils)
diff --git a/minsubsystem/minbase_revision.txt b/minsubsystem/minbase_revision.txt
diff --git a/minsubsystem/mingeo_revision.txt b/minsubsystem/mingeo_revision.txt
diff --git a/minsubsystem/minimgapi_revision.txt b/minsubsystem/minimgapi_revision.txt
diff --git a/minsubsystem/minimgio_revision.txt b/minsubsystem/minimgio_revision.txt
diff --git a/minsubsystem/minutils_revision.txt b/minsubsystem/minutils_revision.txt
diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
@@ -5,41 +5,36 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}/libpng
 )
 
-svn_external(DIR zlib URL https://vis.iitp.ru/svn/se/thirdparty/zlib/tags/1_2_5)
+add_subdirectory(zlib)
 set(ZLIB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/zlib)
 set(ZLIB_LIBRARIES zlib)
 set(ZLIB_FOUND TRUE)
 
-svn_external(DIR libjpeg URL https://vis.iitp.ru/svn/se/thirdparty/libjpeg/tags/8c)
+add_subdirectory(libjpeg)
 set(LIBJPEG_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/jpeg)
 set(LIBJPEG_LIBRARIES jpeg)
 set(LIBJPEG_FOUND TRUE)
 
 if (WITH_TIFF)
-  svn_external(DIR libtiff URL https://vis.iitp.ru/svn/se/thirdparty/libtiff/tags/3_9_5)
+add_subdirectory(libtiff)
   set(TIFF_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/tiff)
   set(TIFF_LIBRARIES tiff)
   set(TIFF_FOUND TRUE)
 endif (WITH_TIFF)
 
-svn_external(DIR libpng URL https://vis.iitp.ru/svn/se/thirdparty/libpng/tags/1_5_10beta01)
+add_subdirectory(libpng)
 set(PNG_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/png)
 set(PNG_LIBRARIES png)
 set(PNG_LIBRARY png)
 set(PNG_FOUND TRUE)
 
 if(NOT jsoncpp_FOUND)
-  svn_external(DIR json-cpp URL https://vis.iitp.ru/svn/vi/thirdparty/json-cpp/tags/1_7_4)
+add_subdirectory(json-cpp)
 else()
   message(STATUS "json-cpp already found, will not build")
 endif()
-svn_external(DIR jsoncpp_compat URL https://vis.iitp.ru/svn/vi/thirdparty/jsoncpp_compat/tags/1_0)
-svn_external(DIR valijson URL https://vis.iitp.ru/svn/vi/thirdparty/valijson/tags/a1d330e285.patched DO_NOT_ADD True)
+add_subdirectory(jsoncpp_compat)
 
 if (WITH_TESTS)
-  svn_external(DIR gtest URL https://vis.iitp.ru/svn/se/thirdparty/gtest/tags/r654)
   add_subdirectory(gtest)
-endif (WITH_TESTS)
-
-svn_external(DIR Eigen URL https://vis.iitp.ru/svn/se/thirdparty/Eigen/tags/3_2_5 DO_NOT_ADD True)
-svn_external(DIR tclap URL https://vis.iitp.ru/svn/vi/thirdparty/tclap/tags/1-2-1-release-final)
+endif (WITH_TESTS)
diff --git a/thirdparty/Eigen_revision.txt b/thirdparty/Eigen_revision.txt
diff --git a/thirdparty/jsoncpp_compat_revision.txt b/thirdparty/jsoncpp_compat_revision.txt
diff --git a/thirdparty/libjpeg_revision.txt b/thirdparty/libjpeg_revision.txt
diff --git a/thirdparty/libpng_revision.txt b/thirdparty/libpng_revision.txt
diff --git a/thirdparty/libtiff_revision.txt b/thirdparty/libtiff_revision.txt
diff --git a/thirdparty/tclap_revision.txt b/thirdparty/tclap_revision.txt
diff --git a/thirdparty/valijson_revision.txt b/thirdparty/valijson_revision.txt
diff --git a/thirdparty/zlib_revision.txt b/thirdparty/zlib_revision.txt
diff --git a/vi_packages/CMakeLists.txt b/vi_packages/CMakeLists.txt
@@ -1,7 +1,6 @@
-svn_external(DIR remseg URL https://vis.iitp.ru/svn/vi/packages/remseg/trunk@12445)
-svn_external(DIR i8r URL https://vis.iitp.ru/svn/vi/packages/i8r/trunk@11338)
-svn_external(DIR json-utils URL https://vis.iitp.ru/svn/vi/packages/json-utils/trunk@11713)
-svn_external(DIR validate_json URL https://vis.iitp.ru/svn/vi/packages/validate_json/trunk@11314)
-svn_external(DIR vi_cvt URL https://vis.iitp.ru/svn/vi/packages/vi_cvt/trunk@11968)
-
+add_subdirectory(remseg)
+add_subdirectory(i8r)
+add_subdirectory(json-utils)
+add_subdirectory(validate_json)
+add_subdirectory(vi_cvt URL)
 add_subdirectory(colorseg)
diff --git a/vi_packages/i8r_revision.txt b/vi_packages/i8r_revision.txt
diff --git a/vi_packages/json-utils_revision.txt b/vi_packages/json-utils_revision.txt
diff --git a/vi_packages/remseg_revision.txt b/vi_packages/remseg_revision.txt
diff --git a/vi_packages/validate_json_revision.txt b/vi_packages/validate_json_revision.txt
diff --git a/vi_packages/vi_cvt_revision.txt b/vi_packages/vi_cvt_revision.txt