diff options
| author | Patrick Storz <eduard.braun2@gmx.de> | 2019-06-08 21:07:02 +0000 |
|---|---|---|
| committer | Patrick Storz <eduard.braun2@gmx.de> | 2019-06-09 00:46:22 +0000 |
| commit | 5d824f8bb5b0dc11f0459600d277838ed6f2e057 (patch) | |
| tree | bba275190705077ff0dd7e23634da8019a2bcf60 /src | |
| parent | Minor cleanup (remove unneeded win32-specific defines) (diff) | |
| download | inkscape-5d824f8bb5b0dc11f0459600d277838ed6f2e057.tar.gz inkscape-5d824f8bb5b0dc11f0459600d277838ed6f2e057.zip | |
CMake: Use bin subfolder for binaries on Windows
Second part of https://gitlab.com/inkscape/inkscape/issues/82
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index bfe00f7b0..d317cbeb1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -379,22 +379,10 @@ target_link_libraries(inkview inkscape_base) #Define the installation -if(NOT WIN32) - install(TARGETS - inkscape - inkview - RUNTIME DESTINATION bin) - if(BUILD_SHARED_LIBS) +install(TARGETS inkscape inkview RUNTIME DESTINATION bin) +if(WIN32) + install(TARGETS inkscape_com inkview_com) +endif() +if(BUILD_SHARED_LIBS) install(TARGETS inkscape_base LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/inkscape) - endif() -else() - install(TARGETS - inkscape - inkscape_com - inkview - inkview_com - RUNTIME DESTINATION .) - if(BUILD_SHARED_LIBS) - install(TARGETS inkscape_base RUNTIME DESTINATION .) - endif() endif() |