diff options
| author | Eduard Braun <eduard.braun2@gmx.de> | 2017-05-08 23:22:58 +0000 |
|---|---|---|
| committer | Eduard Braun <eduard.braun2@gmx.de> | 2017-05-08 23:22:58 +0000 |
| commit | 4c0dbf08b7e1b057fa4c108dfd6ef02b267f0586 (patch) | |
| tree | 085d5f93a16101da064efb98068796f2ea3fdf79 | |
| parent | cmake: Correctly use 'install(TARGETS ...)' instead of 'install(FILES ...)' f... (diff) | |
| download | inkscape-4c0dbf08b7e1b057fa4c108dfd6ef02b267f0586.tar.gz inkscape-4c0dbf08b7e1b057fa4c108dfd6ef02b267f0586.zip | |
cmake: do not install static libraries on Windows
(bzr r15679)
| -rw-r--r-- | CMakeScripts/HelperMacros.cmake | 13 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 |
2 files changed, 10 insertions, 5 deletions
diff --git a/CMakeScripts/HelperMacros.cmake b/CMakeScripts/HelperMacros.cmake index d5e6d8536..a0bdd9866 100644 --- a/CMakeScripts/HelperMacros.cmake +++ b/CMakeScripts/HelperMacros.cmake @@ -34,10 +34,15 @@ macro(add_inkscape_lib # works fine without having the includes # listed is helpful for IDE's (QtCreator/MSVC) inkscape_source_group("${sources}") - install(TARGETS ${name} - LIBRARY DESTINATION lib/inkscape - ARCHIVE DESTINATION lib/inkscape - ) + + # static libraries are probably not useful on Windows + # (if we ever build shared libraries those would use the RUNTIME target and we might have to revisit this) + if(NOT WIN32) + install(TARGETS ${name} + LIBRARY DESTINATION lib/inkscape + ARCHIVE DESTINATION lib/inkscape + ) + endif() endmacro() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a189b96ca..25a42a4a0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -565,5 +565,5 @@ else() inkscape_com inkview inkview_com - DESTINATION .) + RUNTIME DESTINATION .) endif() |