← Back to branch summary

~inkscape.dev/inkscape/extensionImprovements

« back to all changes in this revision

Viewing changes to CMakeScripts/InstallMSYS2.cmake

  • Committer: Eduard Braun
  • Date: 2017-05-08 22:59:44 UTC
  • Revision ID: eduard.braun2@gmx.de-20170508225944-9dfhr5zgnxui970m
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

Show diffs side-by-side

added added

removed removed

Lines of Context:
CMakeScripts/InstallMSYS2.cmake
1
1
if(WIN32)
2
 
  install(PROGRAMS
3
 
    ${EXECUTABLE_OUTPUT_PATH}/inkscape.exe
4
 
    ${EXECUTABLE_OUTPUT_PATH}/inkview.exe
5
 
    DESTINATION ${CMAKE_INSTALL_PREFIX}
6
 
  )
7
 
 
8
 
  install(PROGRAMS
9
 
        ${EXECUTABLE_OUTPUT_PATH}/inkscape_com.exe
10
 
        DESTINATION ${CMAKE_INSTALL_PREFIX}
11
 
        RENAME inkscape.com
12
 
  )
13
 
  install(PROGRAMS
14
 
        ${EXECUTABLE_OUTPUT_PATH}/inkview_com.exe
15
 
        DESTINATION ${CMAKE_INSTALL_PREFIX}
16
 
        RENAME inkview.com
17
 
  )
18
 
 
19
 
  install(FILES
20
 
    ${LIBRARY_OUTPUT_PATH}/libinkscape_base.dll
21
 
    DESTINATION ${CMAKE_INSTALL_PREFIX}
22
 
  )
23
 
 
24
2
  install(FILES
25
3
    AUTHORS
26
4
    COPYING