diff --git a/CMakeLists.txt b/CMakeLists.txt
index ae4d3b6..af30111 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@ option(BUILD_SHARED_LIBS "build as shared library" OFF)
option(PYTHON_MODULE "compile the Catima python module(requires numpy and cython installed)" OFF)
option(TESTS "build tests" OFF)
option(EXAMPLES "build examples" OFF)
-option(APPS "build catima applications" ON)
+option(APPS "build catima applications" OFF)
option(GLOBAL "build with global, sources are required" OFF)
option(REACTIONS "enable/disable nuclear reaction rate" ON)
option(STORE_SPLINES "store splines, if disables splines are always recreated" ON)
@@ -32,6 +32,7 @@ MESSAGE(STATUS "Build type: " ${CMAKE_BUILD_TYPE})
################################
######### compiler flags ###########
+set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
MESSAGE(STATUS "install prefix: " ${CMAKE_INSTALL_PREFIX})
@@ -49,29 +50,6 @@ if(GSL_INTEGRATION OR GSL_INTERPOLATION)
list(APPEND EXTRA_LIBS ${GSL_LIBRARIES} )
endif()
-#find_package(nurex QUIET)
-#if(nurex_FOUND)
-#message(STATUS "nurex library found")
-#set(NUREX ON)
-#list(APPEND EXTRA_LIBS nurex::nurex)
-#endif(nurex_FOUND)
-
-find_package(fmt QUIET)
-function(check_fmt)
- if(NOT fmt_FOUND)
- message("fmt library not found, trying to dowload")
- include(FetchContent)
- FetchContent_Declare(
- fmt
- GIT_REPOSITORY https://github.com/fmtlib/fmt.git
- GIT_TAG 8.1.1
- )
- set(CMAKE_POSITION_INDEPENDENT_CODE ON)
- set(FMT_INSTALL ON)
- FetchContent_MakeAvailable(fmt)
- endif(NOT fmt_FOUND)
-endfunction(check_fmt)
-
configure_file( "${CMAKE_CURRENT_SOURCE_DIR}/build_config.in"
"${CMAKE_CURRENT_BINARY_DIR}/include/catima/build_config.h")
diff --git a/convert.h b/convert.h
index 874039a..1230c15 100644
--- a/convert.h
+++ b/convert.h
@@ -12,6 +12,8 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
+ *
+ * Modifed by GWM to remove unecessary fmt dependance (only place used in entire library)
*/
#ifndef CONVERT_H
@@ -22,7 +24,6 @@
#include
#include
#include
-#include "fmt/format.h"
using namespace catima;
@@ -52,7 +53,9 @@ bool save_mocadi(const char* filename, const Projectile p, const Layers &layers,
fw.open(filename, std::ios::out);
if (!fw.is_open()) { return false;}
fw<<"epax 2\natima-1.0\noption listmode root\n";
- std::string beam = fmt::format("BEAM\n100000\n{}, 0, {}, {}\n2\n{}, {}, 0, 0, 0\n2\n{}, {}, 0, 0, 0\n1\n0, 0, 0, 0, 0\n",p.T,p.A,p.Z,psx.sigma_x,1000*psx.sigma_a, psy.sigma_x,1000*psy.sigma_a);
+ std::string beam = "BEAM\n100000\n" + std::to_string(p.T) + ", 0, " + std::to_string(p.A) + ", " + std::to_string(p.Z) + "\n2\n" +
+ std::to_string(psx.sigma_x) + ", " + std::to_string(1000*psx.sigma_a) + ", 0, 0, 0\n2\n" +
+ std::to_string(psy.sigma_x) + ", " + std::to_string(1000*psy.sigma_a) + ", 0, 0, 0\n1\n0, 0, 0, 0, 0";
fw<