forked from microsoft/vcpkg
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[vxl] Revise deps, enable CI, add test port (microsoft#41310)
- Loading branch information
Showing
20 changed files
with
394 additions
and
57 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| diff --git a/config/cmake/Modules/UseVXL.cmake b/config/cmake/Modules/UseVXL.cmake | ||
| index fba90e4..e7b3b62 100644 | ||
| --- a/config/cmake/Modules/UseVXL.cmake | ||
| +++ b/config/cmake/Modules/UseVXL.cmake | ||
| @@ -77,7 +77,7 @@ if(VXL_CONFIG_CMAKE) | ||
| include_directories(SYSTEM ${VXL_VCL_INCLUDE_DIRS} ${VXL_CORE_INCLUDE_DIRS}) | ||
|
|
||
| # Add link directories needed to use VXL. | ||
| - link_directories(${VXL_LIBRARY_DIR}) | ||
| + # [vcpkg skip] link_directories(${VXL_LIBRARY_DIR}) | ||
|
|
||
| if(VXL_CMAKE_DOXYGEN_DIR) | ||
| # Allow use of VXL's cmake/doxygen framework | ||
| diff --git a/config/cmake/Modules/VXLConfig_export.cmake.in b/config/cmake/Modules/VXLConfig_export.cmake.in | ||
| index 78eaf51..c69b7d8 100644 | ||
| --- a/config/cmake/Modules/VXLConfig_export.cmake.in | ||
| +++ b/config/cmake/Modules/VXLConfig_export.cmake.in | ||
| @@ -1,6 +1,4 @@ | ||
| # vxl/config/cmake/VXLConfig_export.cmake.in | ||
| -# also configured by CMake to | ||
| -# @PROJECT_BINARY_DIR@/config/cmake/export/VXLConfig.cmake | ||
| # | ||
| # This CMake module is configured by VXL's build process to export the | ||
| # project settings for use by client projects. A client project may | ||
| @@ -33,7 +31,7 @@ set(VXL_LIBRARY_DIR "@CMAKE_INSTALL_PREFIX@/lib") | ||
|
|
||
| # The VXL CMake support directory. | ||
| # Clients projects should not use the Find*.cmake files in this directory. | ||
| -set(VXL_CMAKE_DIR "@CMAKE_INSTALL_PREFIX@/share/vxl/cmake") | ||
| +set(VXL_CMAKE_DIR "@CMAKE_INSTALL_PREFIX@/share/vxl") | ||
|
|
||
| # VXL Configuration options. You don't have to build with the same options as VXL, but it often helps. | ||
| set(BUILD_SHARED_LIBS "@BUILD_SHARED_LIBS@") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| diff --git a/config/cmake/Modules/FindGEOTIFF.cmake b/config/cmake/Modules/FindGEOTIFF.cmake | ||
| index bcc8fc5..ed9420e 100644 | ||
| --- a/config/cmake/Modules/FindGEOTIFF.cmake | ||
| +++ b/config/cmake/Modules/FindGEOTIFF.cmake | ||
| @@ -18,7 +18,7 @@ if (${VXL_USE_GEOTIFF}) | ||
|
|
||
| # If this FORCE variable is unset or is FALSE, try to find a native library. | ||
| if( NOT VXL_FORCE_V3P_GEOTIFF ) | ||
| - include( ${MODULE_PATH}/NewCMake/FindGEOTIFF.cmake ) | ||
| + find_package(GeoTIFF CONFIG REQUIRED) | ||
| if( GEOTIFF_FOUND ) | ||
| set(VXL_USING_NATIVE_GEOTIFF "YES") | ||
| endif() | ||
| diff --git a/config/cmake/Modules/VXLConfig_export.cmake.in b/config/cmake/Modules/VXLConfig_export.cmake.in | ||
| index 86bb564..c69b7d8 100644 | ||
| --- a/config/cmake/Modules/VXLConfig_export.cmake.in | ||
| +++ b/config/cmake/Modules/VXLConfig_export.cmake.in | ||
| @@ -152,6 +152,10 @@ set(VXL_TIFF_INCLUDE_DIR "@TIFF_INCLUDE_DIR@") | ||
| set(VXL_TIFF_LIBRARIES "@TIFF_LIBRARIES@") | ||
|
|
||
| set(VXL_GEOTIFF_FOUND "@GEOTIFF_FOUND@") | ||
| +if(VXL_GEOTIFF_FOUND) | ||
| + include(CMakeFindDependencyMacro) | ||
| + find_dependency(GeoTIFF CONFIG) | ||
| +endif() | ||
| set(VXL_GEOTIFF_INCLUDE_DIR "@GEOTIFF_INCLUDE_DIR@") | ||
| set(VXL_GEOTIFF_LIBRARIES "@GEOTIFF_LIBRARIES@") | ||
|
|
||
| diff --git a/core/vgl/vgl_clip.hxx b/core/vgl/vgl_clip.hxx | ||
| index 9ff64f8..10c986a 100644 | ||
| --- a/core/vgl/vgl_clip.hxx | ||
| +++ b/core/vgl/vgl_clip.hxx | ||
| @@ -144,7 +144,7 @@ namespace { | ||
|
|
||
| #elif HAS_CLIPPER | ||
|
|
||
| -#include <clipper.hxx> | ||
| +#include <clipper.hpp> | ||
|
|
||
| namespace { | ||
| //: Creates a Clipper polygon from a vgl_polygon. | ||
| diff --git a/v3p/CMakeLists.txt b/v3p/CMakeLists.txt | ||
| index 251ef9a..78a84fc 100644 | ||
| --- a/v3p/CMakeLists.txt | ||
| +++ b/v3p/CMakeLists.txt | ||
| @@ -48,6 +48,9 @@ CMAKE_DEPENDENT_OPTION( VXL_FORCE_V3P_RPLY "Use V3P instead of any native RPLY l | ||
| mark_as_advanced( VXL_FORCE_V3P_RPLY ) | ||
|
|
||
| if(VXL_BUILD_CORE_IMAGING) | ||
| + add_subdirectory(openjpeg2) | ||
| +elseif(0) | ||
| + # not used by core and vcl | ||
| include(${VXL_CMAKE_DIR}/FindZLIB.cmake) | ||
| if (VXL_FORCE_V3P_ZLIB OR ( NOT VXL_USING_NATIVE_ZLIB ) AND IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/zlib) | ||
| add_subdirectory(zlib) |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt | ||
| index 3483f9c..5040676 100644 | ||
| --- a/core/CMakeLists.txt | ||
| +++ b/core/CMakeLists.txt | ||
| @@ -60,6 +60,10 @@ if(VXL_BUILD_CORE_IMAGING) | ||
| if(VXL_BUILD_CORE_NUMERICS) | ||
| add_subdirectory (vil/algo) | ||
| endif() | ||
| +else() | ||
| + file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/vil) | ||
| + file(WRITE ${PROJECT_BINARY_DIR}/vil/vil_config.h "/* core imaging disabled */") | ||
| + install(FILES ${PROJECT_BINARY_DIR}/vil/vil_config.h DESTINATION include/vxl/core/vil) | ||
| endif() | ||
|
|
||
|
|
||
| diff --git a/core/vpgl/file_formats/CMakeLists.txt b/core/vpgl/file_formats/CMakeLists.txt | ||
| index cd33c8e..e2501d3 100644 | ||
| --- a/core/vpgl/file_formats/CMakeLists.txt | ||
| +++ b/core/vpgl/file_formats/CMakeLists.txt | ||
| @@ -8,7 +8,7 @@ set( vpgl_file_formats_sources | ||
| ) | ||
|
|
||
| include(${VXL_CMAKE_DIR}/FindTIFF.cmake) | ||
| -if(TIFF_FOUND) | ||
| +if(VXL_BUILD_CORE_IMAGING) | ||
| include_directories(${TIFF_INCLUDE_DIR}) | ||
| include( ${VXL_CMAKE_DIR}/FindGEOTIFF.cmake) | ||
| if(GEOTIFF_FOUND) |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| diff --git a/core/vsl/Templates/vsl_vector_io+uint_64-.cxx b/core/vsl/Templates/vsl_vector_io+uint_64-.cxx | ||
| index 8807c44..a8090ca 100644 | ||
| --- a/core/vsl/Templates/vsl_vector_io+uint_64-.cxx | ||
| +++ b/core/vsl/Templates/vsl_vector_io+uint_64-.cxx | ||
| @@ -1,6 +1,6 @@ | ||
| #include <vxl_config.h> | ||
|
|
||
| -#if VXL_HAS_INT_64 && !( VXL_INT_64_IS_LONG || VXL_INT_IS_LONG_LONG ) | ||
| +#if VXL_HAS_INT_64 && !( VXL_INT_64_IS_LONG ) | ||
| #include <vsl/vsl_vector_io.hxx> | ||
| VSL_VECTOR_IO_INSTANTIATE(vxl_uint_64); | ||
|
|
||
| diff --git a/core/vsl/vsl_binary_explicit_io.h b/core/vsl/vsl_binary_explicit_io.h | ||
| index 9ff669f..87fff4f 100644 | ||
| --- a/core/vsl/vsl_binary_explicit_io.h | ||
| +++ b/core/vsl/vsl_binary_explicit_io.h | ||
| @@ -141,7 +141,7 @@ macro (int); | ||
| macro (unsigned int); | ||
| macro (long); | ||
| macro (unsigned long); | ||
| -#if VXL_HAS_INT_64 && ! ( VXL_INT_64_IS_LONG || VXL_INT_64_IS_LONGLONG ) | ||
| +#if VXL_HAS_INT_64 && ! ( VXL_INT_64_IS_LONG ) | ||
| macro (vxl_int_64); | ||
| macro (vxl_uint_64); | ||
| #endif | ||
| @@ -486,7 +486,7 @@ inline std::size_t vsl_convert_from_arbitrary_length(const unsigned char* buffer | ||
|
|
||
| ///////////////////////////////////////////////////////////////////////// | ||
|
|
||
| -#if VXL_HAS_INT_64 && !( VXL_INT_64_IS_LONG || VXL_INT_64_IS_LONGLONG ) | ||
| +#if VXL_HAS_INT_64 && !( VXL_INT_64_IS_LONG ) | ||
|
|
||
| //: Decode a buffer of arbitrary length integers | ||
| // Converts from the integers from the arbitrary length format into | ||
| diff --git a/core/vsl/vsl_binary_io.cxx b/core/vsl/vsl_binary_io.cxx | ||
| index c36142b..af76327 100644 | ||
| --- a/core/vsl/vsl_binary_io.cxx | ||
| +++ b/core/vsl/vsl_binary_io.cxx | ||
| @@ -65,7 +65,7 @@ MACRO_MAKE_INTEGER_READ_WRITE(short); | ||
| MACRO_MAKE_INTEGER_READ_WRITE(unsigned short); | ||
| MACRO_MAKE_INTEGER_READ_WRITE(long); | ||
| MACRO_MAKE_INTEGER_READ_WRITE(unsigned long); | ||
| -#if VXL_HAS_INT_64 && !( VXL_INT_64_IS_LONG || VXL_INT_64_IS_LONGLONG) | ||
| +#if VXL_HAS_INT_64 && !( VXL_INT_64_IS_LONG ) | ||
| MACRO_MAKE_INTEGER_READ_WRITE(vxl_int_64); | ||
| MACRO_MAKE_INTEGER_READ_WRITE(vxl_uint_64); | ||
| #endif | ||
| diff --git a/core/vsl/vsl_binary_io.h b/core/vsl/vsl_binary_io.h | ||
| index d38478a..1a68137 100644 | ||
| --- a/core/vsl/vsl_binary_io.h | ||
| +++ b/core/vsl/vsl_binary_io.h | ||
| @@ -376,7 +376,7 @@ void vsl_b_read(vsl_b_istream& is,unsigned long& n ); | ||
| inline void vsl_print_summary(std::ostream& os, unsigned long n ) | ||
| { os << n; } | ||
|
|
||
| -#if VXL_HAS_INT_64 && !( VXL_INT_64_IS_LONG || VXL_INT_64_IS_LONGLONG ) | ||
| +#if VXL_HAS_INT_64 && !( VXL_INT_64_IS_LONG ) | ||
|
|
||
| //: Write to vsl_b_ostream | ||
| void vsl_b_write(vsl_b_ostream& os,vxl_int_64 n ); |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| diff --git a/core/vul/vul_temp_filename.cxx b/core/vul/vul_temp_filename.cxx | ||
| index 87649e8..1fb263a 100644 | ||
| --- a/core/vul/vul_temp_filename.cxx | ||
| +++ b/core/vul/vul_temp_filename.cxx | ||
| @@ -11,7 +11,7 @@ | ||
|
|
||
| #if defined (_MSC_VER) || defined(__MINGW32__) | ||
|
|
||
| -# include <Windows.h> | ||
| +# include <windows.h> | ||
| #else | ||
| #if defined(unix) || defined(__unix) || defined(__unix__) || defined(__APPLE__) | ||
| // Helper functions for Unix |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| diff --git a/vcl/CMakeLists.txt b/vcl/CMakeLists.txt | ||
| index dd83858..243d57b 100644 | ||
| --- a/vcl/CMakeLists.txt | ||
| +++ b/vcl/CMakeLists.txt | ||
| @@ -115,7 +115,7 @@ vxl_configure_file(${CMAKE_CURRENT_LIST_DIR}/vcl_where_root_dir.h.in ${PROJECT_B | ||
|
|
||
| include_directories(${PROJECT_BINARY_DIR}) | ||
| set( vcl_sources | ||
| - vcl_legacy_aliases.h ${VCL_COMPILER_DETECTION_HEADER} | ||
| + vcl_legacy_aliases.h | ||
| vcl_deprecated.cxx vcl_deprecated.h | ||
|
|
||
| vcl_cmath.h |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| diff --git a/config/cmake/Modules/FindOpenJPEG2.cmake b/config/cmake/Modules/FindOpenJPEG2.cmake | ||
| index c76bc44..41dc198 100644 | ||
| --- a/config/cmake/Modules/FindOpenJPEG2.cmake | ||
| +++ b/config/cmake/Modules/FindOpenJPEG2.cmake | ||
| @@ -62,6 +62,8 @@ set(OPENJPEG2_DEFINITIONS "") | ||
|
|
||
| if(OPENJPEG2_FOUND) | ||
| set(VXL_USING_NATIVE_OPENJPEG2 "YES") | ||
| +elseif(NOT ENABLE_OPENJPEG) | ||
| + set(VXL_USING_NATIVE_OPENJPEG2 "YES") # to disable internal lib, too | ||
| else() | ||
| if( EXISTS ${VXL_ROOT_SOURCE_DIR}/v3p/openjpeg2/openjpeg.h) | ||
| set(OPENJPEG2_FOUND TRUE) | ||
| diff --git a/v3p/openjpeg2/CMakeLists.txt b/v3p/openjpeg2/CMakeLists.txt | ||
| index 67b184e..354180b 100644 | ||
| --- a/v3p/openjpeg2/CMakeLists.txt | ||
| +++ b/v3p/openjpeg2/CMakeLists.txt | ||
| @@ -49,6 +49,7 @@ if(VXL_MATH_LIBRARY_FOUND) | ||
| endif() | ||
| mark_as_advanced(VXL_MATH_LIBRARY_FOUND) | ||
| set_target_properties(openjpeg2 PROPERTIES | ||
| + OUTPUT_NAME vxl_openjpeg | ||
| VERSION 2.0.0 | ||
| DEFINE_SYMBOL OPJ_EXPORTS) | ||
| endif() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| vxl provides CMake targets: | ||
|
|
||
| find_package(VXL CONFIG REQUIRED) | ||
| include("${VXL_CMAKE_DIR}/UseVXL.cmake") | ||
| # Example: numerics library 'vnl'. | ||
| target_link_libraries(main PRIVATE $<TARGET_NAME:vnl>) |
Oops, something went wrong.