Skip to content

Commit c6a4cef

Browse files
committed
Fix installation target directories
1 parent bc498e1 commit c6a4cef

File tree

2 files changed

+9
-17
lines changed

2 files changed

+9
-17
lines changed

CMakeLists.txt

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -135,21 +135,14 @@ ENDIF ( TTK_STUB_LIBRARY )
135135
# IF ( TK_LIBRARY_STATIC )
136136
# TARGET_LINK_LIBRARIES ( ${PKG_TARGET_LIB_NAME} ${TK_LIBRARY_STATIC} )
137137
# ENDIF ( TK_LIBRARY_STATIC )
138-
ADD_CUSTOM_TARGET ( copy ALL ${CMAKE_COMMAND} -E copy
139-
${CMAKE_SOURCE_DIR}/src/extrafont.tcl
140-
${CMAKE_SOURCE_DIR}/src/fontnameinfo.tcl
141-
${CMAKE_SOURCE_DIR}/src/pkgIndex.tcl
142-
${CMAKE_SOURCE_DIR}/src/futmp.tcl
143-
${CMAKE_SOURCE_DIR}/tkextrafont )
144-
ADD_DEPENDENCIES ( ${PKG_TARGET_LIB_NAME} copy )
145138

146-
SET ( LIBRARY_OUTPUT_PATH tkextrafont )
147139
INSTALL ( TARGETS ${PKG_TARGET_LIB_NAME}
148-
RUNTIME DESTINATION ./tkextrafont
149-
LIBRARY DESTINATION ./tkextrafont
150-
ARCHIVE DESTINATION ./tkextrafont )
151-
INSTALL ( FILES tkextrafont/extrafont.tcl
152-
tkextrafont/fontnameinfo.tcl
153-
tkextrafont/futmp.tcl
154-
tkextrafont/pkgIndex.tcl
155-
DESTINATION ${PKG_TARGET_LIB_NAME} )
140+
RUNTIME DESTINATION tkextrafont
141+
LIBRARY DESTINATION tkextrafont
142+
ARCHIVE DESTINATION tkextrafont )
143+
INSTALL ( FILES
144+
tkextrafont/pkgIndex.tcl
145+
tkextrafont/extrafont.tcl
146+
tkextrafont/futmp.tcl
147+
tkextrafont/fontnameinfo.tcl
148+
DESTINATION tkextrafont )

clean.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#!/bin/bash
22
rm tkextrafont/libextrafont.dll
33
rm tkextrafont/libextrafont.so
4-
rm tkextrafont/*.tcl
54
rm CMakeCache.txt
65
rm cmake_install.cmake
76
rm -rf cmake-build-debug cmake-build-release

0 commit comments

Comments
 (0)