Skip to content

Commit

Permalink
3.10.4 has known unsolved issue:
Browse files Browse the repository at this point in the history
  • Loading branch information
chakpongchung committed Dec 17, 2021
1 parent 6e2d559 commit 233c2fc
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 4 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ At the minimum, Katana depends on the following software:
- libxml2 (>= 2.9.1)
- libarrow (>= 4.0)
- libuuid (>= 2.31.1)
- [nlohmann/json](https://github.com/nlohmann/json) (>= 3.10.4)
- [nlohmann/json](https://github.com/nlohmann/json) (>= 3.10.3)

Here are the dependencies for the optional features:

Expand Down
2 changes: 1 addition & 1 deletion conda_recipe/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ dependencies:
- nbsphinx>=0.8
- ncurses>=6.1,<7a0
- ninja>=1.10
- nlohmann_json>=3.10.4,<4a0
- nlohmann_json>=3.10.3,<4a0
- numba>=0.53.1,<0.54a0
- numpy>=1.17,<2a0
- openblas>=0.3.12
Expand Down
2 changes: 1 addition & 1 deletion katana_requirements.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ ninja:
labels:
- conda
nlohmann_json:
version: [ 3.10.4, 4 ]
version: [ 3.10.3, 4 ]
labels:
- conda
- conan
Expand Down
21 changes: 20 additions & 1 deletion libsupport/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,29 @@ set_common_katana_library_options(katana_support ALWAYS_SHARED)

target_link_libraries(katana_support PUBLIC arrow::arrow arrow::parquet)

if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
MESSAGE("CMAKE_CXX_COMPILER_ID: GNU")
if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.1)
MESSAGE("CMAKE_CXX_COMPILER_VERSION: ${CMAKE_CXX_COMPILER_VERSION}")
target_link_libraries(katana_support PUBLIC stdc++fs)
endif()
endif()

if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
MESSAGE("CMAKE_CXX_COMPILER_ID: Clang")
if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0)
MESSAGE("CMAKE_CXX_COMPILER_VERSION: ${CMAKE_CXX_COMPILER_VERSION}")
target_link_libraries(katana_support PUBLIC c++fs)
endif()
endif()

find_package(nlohmann_json 3.10.4 REQUIRED)

find_package(nlohmann_json 3.10.3 REQUIRED)
target_link_libraries(katana_support PUBLIC nlohmann_json::nlohmann_json)




find_package(libcurl QUIET)
if(libcurl_FOUND)
# Older conan-generated package name is libcurl. More recent versions (at
Expand Down

0 comments on commit 233c2fc

Please sign in to comment.