Skip to content

Commit 38d310f

Browse files
author
Kasper Peeters
committed
Update pybind11 to #fcb5554.
1 parent caad618 commit 38d310f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+7821
-5018
lines changed

cmake/version.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
set(CADABRA_VERSION_MAJOR 2)
22
set(CADABRA_VERSION_MINOR 4)
33
set(CADABRA_VERSION_PATCH 2)
4-
set(CADABRA_VERSION_TWEAK 0)
4+
set(CADABRA_VERSION_TWEAK 1)
55
set(COPYRIGHT_YEARS "2001-2022")
66
math(EXPR SYSTEM_BITS "${CMAKE_SIZEOF_VOID_P} * 8")
77
find_program(GIT git PATHS ${GIT_DIR})

config/install_script.iss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
33

44
#define MyAppName "Cadabra2"
5-
#define MyAppVersion "2.4.1"
5+
#define MyAppVersion "2.4.2"
66
#define MyAppPublisher "Kasper Peeters"
77
#define MyAppURL "https://www.cadabra.science/"
88
#define MyAppExeName "cadabra2-gtk.exe"

libs/pybind11/CMakeLists.txt

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,8 @@ set(PYBIND11_HEADERS
120120
include/pybind11/complex.h
121121
include/pybind11/options.h
122122
include/pybind11/eigen.h
123+
include/pybind11/eigen/matrix.h
124+
include/pybind11/eigen/tensor.h
123125
include/pybind11/embed.h
124126
include/pybind11/eval.h
125127
include/pybind11/gil.h
@@ -198,6 +200,9 @@ else()
198200
endif()
199201

200202
include("${CMAKE_CURRENT_SOURCE_DIR}/tools/pybind11Common.cmake")
203+
# https://github.com/jtojnar/cmake-snips/#concatenating-paths-when-building-pkg-config-files
204+
# TODO: cmake 3.20 adds the cmake_path() function, which obsoletes this snippet
205+
include("${CMAKE_CURRENT_SOURCE_DIR}/tools/JoinPaths.cmake")
201206

202207
# Relative directory setting
203208
if(USE_PYTHON_INCLUDE_DIR AND DEFINED Python_INCLUDE_DIRS)
@@ -262,6 +267,16 @@ if(PYBIND11_INSTALL)
262267
NAMESPACE "pybind11::"
263268
DESTINATION ${PYBIND11_CMAKECONFIG_INSTALL_DIR})
264269

270+
# pkg-config support
271+
if(NOT prefix_for_pc_file)
272+
set(prefix_for_pc_file "${CMAKE_INSTALL_PREFIX}")
273+
endif()
274+
join_paths(includedir_for_pc_file "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
275+
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/tools/pybind11.pc.in"
276+
"${CMAKE_CURRENT_BINARY_DIR}/pybind11.pc" @ONLY)
277+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/pybind11.pc"
278+
DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig/")
279+
265280
# Uninstall target
266281
if(PYBIND11_MASTER_PROJECT)
267282
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/tools/cmake_uninstall.cmake.in"

0 commit comments

Comments
 (0)