Skip to content

Commit 755edd4

Browse files
committed
Various fixes for CI running
1 parent c6a4cef commit 755edd4

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,9 @@ ENDIF ( TTK_STUB_LIBRARY )
137137
# ENDIF ( TK_LIBRARY_STATIC )
138138

139139
INSTALL ( TARGETS ${PKG_TARGET_LIB_NAME}
140-
RUNTIME DESTINATION tkextrafont
141-
LIBRARY DESTINATION tkextrafont
142-
ARCHIVE DESTINATION tkextrafont )
140+
RUNTIME DESTINATION ./tkextrafont
141+
LIBRARY DESTINATION ./tkextrafont
142+
ARCHIVE DESTINATION ./tkextrafont )
143143
INSTALL ( FILES
144144
tkextrafont/pkgIndex.tcl
145145
tkextrafont/extrafont.tcl

clean.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ rm -rf _skbuild
99
rm -rf tkextrafont.egg-info
1010
rm Makefile MANIFEST extrafont.cbp
1111
rm -rf Testing
12-
rm -rf ./venv/lib/*tkextrafont*
12+
rm -rf ./venv/lib/*/site-packages/*tkextrafont*
13+
rm ./libextrafont*

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ def copy_to_target(self, target: str):
161161
continue
162162

163163
specials = {}
164-
DependencyWalker("tkextrafont/libextrafont.dll", specials=specials).copy_to_target("tkextrafont")
164+
DependencyWalker("libextrafont.dll", specials=specials).copy_to_target("tkextrafont")
165165
kwargs = {"package_data": {"extrafont": ["*.dll", "pkgIndex.tcl", "extrafont.tcl"] + ["{}/{}".format(dir.strip("/"), base) for base, dir in specials.items()]}}
166166

167167
else:

0 commit comments

Comments
 (0)