From 5d824f8bb5b0dc11f0459600d277838ed6f2e057 Mon Sep 17 00:00:00 2001 From: Patrick Storz Date: Sat, 8 Jun 2019 23:07:02 +0200 Subject: CMake: Use bin subfolder for binaries on Windows Second part of https://gitlab.com/inkscape/inkscape/issues/82 --- src/CMakeLists.txt | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) (limited to 'src') 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() -- cgit v1.2.3