Skip to content

Commit

Permalink
Merge pull request #51 from ausgerechnet/v0.11.1
Browse files Browse the repository at this point in the history
v0.11.1
  • Loading branch information
ausgerechnet authored Oct 18, 2022
2 parents bf48f5d + b92803c commit 80d758e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion ccc/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
"""

__version__ = "0.11.0"
__version__ = "0.11.1"
7 changes: 6 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,19 @@
cwb_incdir = subprocess.run(shlex.split("cwb-config --incdir"), capture_output=True).stdout.decode().strip()
# - compiler flags for linking against CL library
cwb_compiler_flags = subprocess.run(shlex.split("cwb-config -I"), capture_output=True).stdout.decode().strip()
# -linker flags for linking against CL library
# - linker flags for linking against CL library
cwb_linker_flags = subprocess.run(shlex.split("cwb-config -L"), capture_output=True).stdout.decode().strip()


####################################
# define (and compile) C-extension #
####################################

# ensure compatibility with CWB v3.4.36 and below
if int(cwb_version.split(".")[0]) == 3 and int(cwb_version.split(".")[1]) == 4 and int(cwb_version.split(".")[2]) < 37:
cwb_linker_flags = "-L/usr/local/lib -lcl -lm -lpcre -lglib-2.0"
libraries = [t[2:] for t in shlex.split(cwb_linker_flags) if t.startswith("-l")]

ccc_cl = Extension(
name="ccc.cl",
sources=['ccc/cl' + ('.pyx' if USE_CYTHON else '.c')],
Expand Down

0 comments on commit 80d758e

Please sign in to comment.