Skip to content

Commit

Permalink
Fix Windows warning and bump CMake version
Browse files Browse the repository at this point in the history
  • Loading branch information
barche committed Aug 21, 2023
1 parent 70bb337 commit 2bde32d
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.1)
cmake_minimum_required(VERSION 3.5)
project(JlCxx)

# Cmake policies
Expand Down
2 changes: 1 addition & 1 deletion src/c_interface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion testlib-builder/src/testlib/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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")

Expand Down

0 comments on commit 2bde32d

Please sign in to comment.