diff --git a/CMakeLists.txt b/CMakeLists.txt index 3650aca..a3c39ec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.5) project(JlCxx) # Cmake policies diff --git a/src/c_interface.cpp b/src/c_interface.cpp index f5a64c3..33b9ea1 100644 --- a/src/c_interface.cpp +++ b/src/c_interface.cpp @@ -62,7 +62,7 @@ JLCXX_API void initialize_cxxwrap(jl_value_t* julia_module, jl_value_t* cppfunct { if((jl_module_t*)julia_module != g_cxxwrap_module) { - throw std::runtime_error("Two different CxxWrap modules are loaded, aborting."); + jl_error("Two different CxxWrap modules are loaded, aborting."); } return; } diff --git a/testlib-builder/src/testlib/CMakeLists.txt b/testlib-builder/src/testlib/CMakeLists.txt index b6b76ce..0f1660b 100644 --- a/testlib-builder/src/testlib/CMakeLists.txt +++ b/testlib-builder/src/testlib/CMakeLists.txt @@ -1,6 +1,6 @@ project(TestLib) -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.5) set(CMAKE_MACOSX_RPATH 1) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")