From 52cdab43b062ef34f83de8c8ced7c29f43b2d16d Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Tue, 22 Jan 2019 18:08:57 +0100 Subject: [PATCH 1/1] appveyor: try to get pybind11 --- .appveyor.yml | 4 +++- CMakeLists.txt | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index fe234b706b..3653ad4df2 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -34,11 +34,13 @@ install: # Lua #- choco install lua53 # We need python v3 -- cmd: SET PATH=C:\Python35-x64;%PATH% # We need python v3 +- cmd: SET PATH=C:\Python37-x64;%PATH% # We need python v3 # Use the mingw-w64 provided by Appveyor (must be placed before Perl in the path) - cmd: SET PATH=C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64\bin\;%PATH% # Work around a bug on appveyor where the default sh is not the one I expect - rename "C:\Program Files\Git\usr\bin\sh.exe" "sh-ignored.exe" +# We need pybind11. SimGrid will pick it automatically if the subdir is here +- cmd: git clone --depth=1 https://github.com/pybind/pybind11.git build_script: - cmake -G "MinGW Makefiles" -Denable_lua=OFF -Denable_documentation=OFF -Denable_java=ON -Denable_smpi=OFF -Denable_mallocators=OFF -Denable_lto=OFF . diff --git a/CMakeLists.txt b/CMakeLists.txt index 8fbcead2e3..a53bc852b3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -773,6 +773,9 @@ endif() # Python binding (with pybind11) ################ +if(EXISTS pybind11) # Try to use a local copy of pybind11, if any + add_subdirectory(pybind11) +endif() # Our usage of pybind11::overload_cast mandates C++14 get_property(known_features GLOBAL PROPERTY CMAKE_CXX_KNOWN_FEATURES) -- 2.20.1