From 576e8b76d437b1f3b3583e9a8f5d55f133c11dda Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Tue, 9 May 2017 00:59:44 +0200 Subject: cmake: Correctly use 'install(TARGETS ...)' instead of 'install(FILES ...)' for inkscape executables. It's not only more elegant, but it also makes the "install/strip" target work! Also convert DESTINATION to a relative path. As relative paths are relative to ${CMAKE_INSTALL_PREFIX}, it's effectively the same as before, but cmake does not properly handle absolute paths on Windows, see [1]. [1] https://gitlab.kitware.com/cmake/cmake/issues/16859 (bzr r15678) --- CMakeScripts/InstallMSYS2.cmake | 22 ---------------------- 1 file changed, 22 deletions(-) (limited to 'CMakeScripts/InstallMSYS2.cmake') diff --git a/CMakeScripts/InstallMSYS2.cmake b/CMakeScripts/InstallMSYS2.cmake index a96df045b..982237538 100644 --- a/CMakeScripts/InstallMSYS2.cmake +++ b/CMakeScripts/InstallMSYS2.cmake @@ -1,26 +1,4 @@ if(WIN32) - install(PROGRAMS - ${EXECUTABLE_OUTPUT_PATH}/inkscape.exe - ${EXECUTABLE_OUTPUT_PATH}/inkview.exe - DESTINATION ${CMAKE_INSTALL_PREFIX} - ) - - install(PROGRAMS - ${EXECUTABLE_OUTPUT_PATH}/inkscape_com.exe - DESTINATION ${CMAKE_INSTALL_PREFIX} - RENAME inkscape.com - ) - install(PROGRAMS - ${EXECUTABLE_OUTPUT_PATH}/inkview_com.exe - DESTINATION ${CMAKE_INSTALL_PREFIX} - RENAME inkview.com - ) - - install(FILES - ${LIBRARY_OUTPUT_PATH}/libinkscape_base.dll - DESTINATION ${CMAKE_INSTALL_PREFIX} - ) - install(FILES AUTHORS COPYING -- cgit v1.2.3