@@ -72,6 +72,12 @@ set(MINIEXPR_BUILD_SHARED OFF CACHE BOOL "Build miniexpr shared library" FORCE)
7272set (MINIEXPR_BUILD_TESTS OFF CACHE BOOL "Build miniexpr tests" FORCE )
7373set (MINIEXPR_BUILD_EXAMPLES OFF CACHE BOOL "Build miniexpr examples" FORCE )
7474set (MINIEXPR_BUILD_BENCH OFF CACHE BOOL "Build miniexpr benchmarks" FORCE )
75+ # Keep miniexpr's bundled libtcc and related files inside the blosc2 package.
76+ # Without this, miniexpr's install rules use the default CMAKE_INSTALL_LIBDIR
77+ # ("lib"), which scikit-build places at site-packages/lib.
78+ set (CMAKE_INSTALL_INCLUDEDIR ${SKBUILD_PLATLIB_DIR} /blosc2/include)
79+ set (CMAKE_INSTALL_LIBDIR ${SKBUILD_PLATLIB_DIR} /blosc2/lib)
80+ set (CMAKE_INSTALL_DATADIR ${SKBUILD_PLATLIB_DIR} /blosc2/share)
7581
7682if (EMSCRIPTEN)
7783 set (MINIEXPR_ENABLE_TCC_JIT ON CACHE BOOL "Enable TCC JIT in Emscripten builds" FORCE )
@@ -131,8 +137,6 @@ else()
131137 set (BUILD_BENCHMARKS OFF CACHE BOOL "Build C-Blosc2 benchmarks" )
132138 set (BUILD_FUZZERS OFF CACHE BOOL "Build C-Blosc2 fuzzers" )
133139 set (CMAKE_POSITION_INDEPENDENT_CODE ON )
134- set (CMAKE_INSTALL_INCLUDEDIR ${SKBUILD_PLATLIB_DIR} /blosc2/include) # directory for include files
135- set (CMAKE_INSTALL_LIBDIR ${SKBUILD_PLATLIB_DIR} /blosc2/lib) # directory for libblosc2 and pkgconfig
136140 set (Blosc2_INSTALL_CMAKEDIR ${CMAKE_INSTALL_LIBDIR} /cmake/blosc2) # directory for cmake files
137141 set (CMAKE_INSTALL_BINDIR ${SKBUILD_PLATLIB_DIR} /blosc2/lib) # directory for libblosc2.dll on windows
138142 # we will put the binaries of the C-Blosc2 library into the wheels according to PEP
@@ -177,33 +181,3 @@ install(
177181 FILES "${miniexpr_SOURCE_DIR} /src/me_jit_glue.js"
178182 DESTINATION ${SKBUILD_PLATLIB_DIR} /blosc2
179183)
180-
181- # Install bundled libtcc next to the Python package (separate LGPL artifact).
182- if (MINIEXPR_ENABLE_TCC_JIT)
183- if (APPLE )
184- install (
185- FILES "${miniexpr_BINARY_DIR} /libtcc.dylib"
186- DESTINATION ${SKBUILD_PLATLIB_DIR} /blosc2/lib
187- OPTIONAL
188- )
189- elseif (WIN32 )
190- install (
191- FILES
192- "${miniexpr_BINARY_DIR} /tcc.dll"
193- "${miniexpr_BINARY_DIR} /Debug/tcc.dll"
194- "${miniexpr_BINARY_DIR} /Release/tcc.dll"
195- "${miniexpr_BINARY_DIR} /RelWithDebInfo/tcc.dll"
196- "${miniexpr_BINARY_DIR} /MinSizeRel/tcc.dll"
197- DESTINATION ${SKBUILD_PLATLIB_DIR} /blosc2/lib
198- OPTIONAL
199- )
200- else ()
201- install (
202- FILES
203- "${miniexpr_BINARY_DIR} /libtcc.so"
204- "${miniexpr_BINARY_DIR} /libtcc.so.1"
205- DESTINATION ${SKBUILD_PLATLIB_DIR} /blosc2/lib
206- OPTIONAL
207- )
208- endif ()
209- endif ()
0 commit comments