Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Cmake to allow third-party libraries #2006

Merged
merged 10 commits into from
Mar 18, 2022
Merged

Update Cmake to allow third-party libraries #2006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
01117b1
use xtensor library on system if it already exists, else use vendored…
kkiesling Mar 15, 2022
42f95cc
check for xtl on system
kkiesling Mar 15, 2022
7369796
look for existing gls-lite package
kkiesling Mar 15, 2022
8c97252
typo in status message
kkiesling Mar 15, 2022
09d3554
fixed gsl compile error
kkiesling Mar 16, 2022
a7ce3c9
fix pugixml linking issue
kkiesling Mar 16, 2022
2ab0e23
Apply suggestions from code review - remove check for xtl
kkiesling Mar 17, 2022
ad10441
different cases for linking pugixml depending on version
kkiesling Mar 17, 2022
b427472
explicitly include xmanipulation header for xt::flip
kkiesling Mar 17, 2022
ea551e3
update versions of xtl and xtensor in vectfit ci build script to be c…
kkiesling Mar 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 30 additions & 9 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,18 @@ if(pugixml_FOUND)
else()
message(STATUS "Did not find pugixml, will use submodule instead")
endif()

find_package(xtensor QUIET NO_SYSTEM_ENVIRONMENT_PATH)
if(xtensor_FOUND)
message(STATUS "Found xtensor: ${xtensor_DIR} (version ${xtensor_VERSION})")
else()
message(STATUS "Did not find xtensor, will use submodule instead")
endif()
find_package(gsl-lite QUIET NO_SYSTEM_ENVIRONMENT_PATH)
if(gsl-lite_FOUND)
message(STATUS "Found gsl-lite: ${gsl-lite_DIR} (version ${gsl-lite_VERSION})")
else()
message(STATUS "Did not find gsl-lite, will use submodule instead")
endif()
#===============================================================================
# libMesh Unstructured Mesh Support
#===============================================================================
Expand Down Expand Up @@ -211,19 +222,23 @@ if (NOT (CMAKE_VERSION VERSION_LESS 3.13))
cmake_policy(SET CMP0079 NEW)
endif()

add_subdirectory(vendor/xtl)
set(xtl_DIR ${CMAKE_CURRENT_BINARY_DIR}/vendor/xtl)
add_subdirectory(vendor/xtensor)
if (NOT xtensor_FOUND)
add_subdirectory(vendor/xtl)
set(xtl_DIR ${CMAKE_CURRENT_BINARY_DIR}/vendor/xtl)
add_subdirectory(vendor/xtensor)
endif()

#===============================================================================
# GSL header-only library
#===============================================================================

add_subdirectory(vendor/gsl-lite)
if (NOT gsl-lite_FOUND)
add_subdirectory(vendor/gsl-lite)

# Make sure contract violations throw exceptions
target_compile_definitions(gsl-lite-v1 INTERFACE GSL_THROW_ON_CONTRACT_VIOLATION)
target_compile_definitions(gsl-lite-v1 INTERFACE gsl_CONFIG_ALLOWS_NONSTRICT_SPAN_COMPARISON=1)
# Make sure contract violations throw exceptions
target_compile_definitions(gsl-lite-v1 INTERFACE GSL_THROW_ON_CONTRACT_VIOLATION)
target_compile_definitions(gsl-lite-v1 INTERFACE gsl_CONFIG_ALLOWS_NONSTRICT_SPAN_COMPARISON=1)
endif()

#===============================================================================
# RPATH information
Expand Down Expand Up @@ -422,7 +437,13 @@ endif()
# target_link_libraries treats any arguments starting with - but not -l as
# linker flags. Thus, we can pass both linker flags and libraries together.
target_link_libraries(libopenmc ${ldflags} ${HDF5_LIBRARIES} ${HDF5_HL_LIBRARIES}
pugixml faddeeva xtensor gsl-lite-v1 fmt::fmt)
faddeeva xtensor gsl::gsl-lite-v1 fmt::fmt)

if(TARGET pugixml::pugixml)
target_link_libraries(libopenmc pugixml::pugixml)
else()
target_link_libraries(libopenmc pugixml)
endif()

if(dagmc)
target_compile_definitions(libopenmc PRIVATE DAGMC)
Expand Down
1 change: 1 addition & 0 deletions src/plot.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include <sstream>

#include "xtensor/xview.hpp"
#include "xtensor/xmanipulation.hpp"
#include <fmt/core.h>
#include <fmt/ostream.h>
#ifdef USE_LIBPNG
Expand Down
4 changes: 2 additions & 2 deletions tools/ci/gha-install-vectfit.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ set -ex
PYBIND_BRANCH='master'
PYBIND_REPO='https://github.com/pybind/pybind11'

XTL_BRANCH='0.6.9'
XTL_BRANCH='0.6.13'
XTL_REPO='https://github.com/xtensor-stack/xtl'

XTENSOR_BRANCH='0.21.2'
XTENSOR_BRANCH='0.21.3'
XTENSOR_REPO='https://github.com/xtensor-stack/xtensor'

XTENSOR_PYTHON_BRANCH='0.24.1'
Expand Down