From 514d8350a2a6e33351f8bec5e0a5d5e85959e656 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Wed, 20 Jun 2018 07:27:59 -0500 Subject: [PATCH] Move Faddeeva source into vendor/ directory --- CMakeLists.txt | 4 ++-- {src => vendor}/faddeeva/Faddeeva.c | 0 {src => vendor}/faddeeva/Faddeeva.cc | 0 {src => vendor}/faddeeva/Faddeeva.h | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename {src => vendor}/faddeeva/Faddeeva.c (100%) rename {src => vendor}/faddeeva/Faddeeva.cc (100%) rename {src => vendor}/faddeeva/Faddeeva.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index ec77fa0e3..d154b1cf3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -320,7 +320,8 @@ endif() # Build faddeeva library #=============================================================================== -add_library(faddeeva STATIC src/faddeeva/Faddeeva.c) +add_library(faddeeva STATIC vendor/faddeeva/Faddeeva.c) +target_compile_options(faddeeva PRIVATE ${cflags}) #=============================================================================== # List source files. Define the libopenmc and the OpenMC executable @@ -469,7 +470,6 @@ target_include_directories(libopenmc PUBLIC include ${HDF5_INCLUDE_DIRS}) # The executable and the faddeeva package use only one language. They can be # set via target_compile_options which accepts a list. target_compile_options(${program} PUBLIC ${cxxflags}) -target_compile_options(faddeeva PRIVATE ${cflags}) # The libopenmc library has both F90 and C++ so the compile flags must be set # file-by-file via set_source_file_properties. The compile flags must first be diff --git a/src/faddeeva/Faddeeva.c b/vendor/faddeeva/Faddeeva.c similarity index 100% rename from src/faddeeva/Faddeeva.c rename to vendor/faddeeva/Faddeeva.c diff --git a/src/faddeeva/Faddeeva.cc b/vendor/faddeeva/Faddeeva.cc similarity index 100% rename from src/faddeeva/Faddeeva.cc rename to vendor/faddeeva/Faddeeva.cc diff --git a/src/faddeeva/Faddeeva.h b/vendor/faddeeva/Faddeeva.h similarity index 100% rename from src/faddeeva/Faddeeva.h rename to vendor/faddeeva/Faddeeva.h