drewcassidy/quicktex
1
0
Fork 0
mirror of https://github.com/drewcassidy/quicktex.git synced 2024-09-13 06:37:34 +00:00
Code Issues Projects Releases Activity

Fix compilation of test wrapper

Browse Source
This commit is contained in:
Andrew Cassidy 2022-05-08 16:06:36 -07:00
parent c79ffc8794
commit 9eaaf901f3
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -5,7 +5,14 @@ include(tools/CompilerWarnings.cmake)
project(quicktex) project(quicktex)
# Find dependencies # Find dependencies
find_package(Python COMPONENTS Interpreter Development.Module) if (DEFINED QUICKTEX_MODULE_ONLY)
# Not all python installs include the headers necessary for embedding. If we are only building the module,
# we can ignore the embed headers
find_package(Python COMPONENTS Interpreter Development.Module)
else ()
find_package(Python COMPONENTS Interpreter Development)
endif ()
find_package(pybind11 CONFIG REQUIRED) find_package(pybind11 CONFIG REQUIRED)
find_package(OpenMP) find_package(OpenMP)

20
setup.py
View File

@ -1,9 +1,9 @@
import os import os
import re import re
import sys
import subprocess import subprocess
import pybind11 import sys
import pybind11
from setuptools import setup, Extension from setuptools import setup, Extension
from setuptools.command.build_ext import build_ext from setuptools.command.build_ext import build_ext
@ -43,7 +43,8 @@ class CMakeBuild(build_ext):
"-Dpybind11_DIR={}".format(pybind11.get_cmake_dir()), "-Dpybind11_DIR={}".format(pybind11.get_cmake_dir()),
"-DPython_EXECUTABLE={}".format(sys.executable), "-DPython_EXECUTABLE={}".format(sys.executable),
"-DPython_ROOT_DIR={}".format(os.path.dirname(sys.executable)), "-DPython_ROOT_DIR={}".format(os.path.dirname(sys.executable)),
"-DQUICKTEX_VERSION_INFO={}".format(version), "-DQUICKTEX_VERSION_INFO={}".format(version), # include version info in module
"-DQUICKTEX_MODULE_ONLY=TRUE", # only build the module, not the wrapper
"-DCMAKE_BUILD_TYPE={}".format(cfg), # not used on MSVC, but no harm "-DCMAKE_BUILD_TYPE={}".format(cfg), # not used on MSVC, but no harm
# clear cached make program binary, see https://github.com/pypa/setuptools/issues/2912 # clear cached make program binary, see https://github.com/pypa/setuptools/issues/2912
"-U", "-U",
@ -68,12 +69,7 @@ class CMakeBuild(build_ext):
contains_arch = any(x in cmake_generator for x in {"ARM", "Win64"}) contains_arch = any(x in cmake_generator for x in {"ARM", "Win64"})
# Convert distutils Windows platform specifiers to CMake -A arguments # Convert distutils Windows platform specifiers to CMake -A arguments
plat_to_cmake = { plat_to_cmake = {"win32": "Win32", "win-amd64": "x64", "win-arm32": "ARM", "win-arm64": "ARM64"}
"win32": "Win32",
"win-amd64": "x64",
"win-arm32": "ARM",
"win-arm64": "ARM64",
}
# Specify the arch if using MSVC generator, but only if it doesn't # Specify the arch if using MSVC generator, but only if it doesn't
# contain a backward-compatibility arch spec already in the # contain a backward-compatibility arch spec already in the
@ -110,8 +106,4 @@ class CMakeBuild(build_ext):
# The information here can also be placed in setup.cfg - better separation of # The information here can also be placed in setup.cfg - better separation of
# logic and declaration, and simpler if you include description/version in a file. # logic and declaration, and simpler if you include description/version in a file.
setup( setup(use_scm_version=True, ext_modules=[CMakeExtension("_quicktex")], cmdclass={"build_ext": CMakeBuild})
use_scm_version=True,
ext_modules=[CMakeExtension("_quicktex")],
cmdclass={"build_ext": CMakeBuild},
)