From 24ac45b8bad3a477e2af643c36a77d82916a2017 Mon Sep 17 00:00:00 2001 From: Sebastian Faubel Date: Wed, 6 Jul 2016 17:45:34 +0200 Subject: Fixing build for Linux. (bzr r15002.1.8) --- CMakeLists.txt | 5 +++++ CMakeScripts/Install.cmake | 5 +---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 51d665128..910ed4e20 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -165,6 +165,11 @@ endif() # ----------------------------------------------------------------------------- # Installation # ----------------------------------------------------------------------------- +if(NOT WIN32) + # this should probably be done no matter what the platform is, just set SHARE_INSTALL first + add_subdirectory(share) +endif() + include(CMakeScripts/Install.cmake) # ----------------------------------------------------------------------------- diff --git a/CMakeScripts/Install.cmake b/CMakeScripts/Install.cmake index 8306cec16..aee0444de 100644 --- a/CMakeScripts/Install.cmake +++ b/CMakeScripts/Install.cmake @@ -5,10 +5,7 @@ if(UNIX) DESTINATION ${CMAKE_INSTALL_PREFIX}/${SHARE_INSTALL}/applications) endif() -if(NOT WIN32) - # this should probably be done no matter what the platform is, just set SHARE_INSTALL first - add_subdirectory(../share) -else() +if(WIN32) install(PROGRAMS ${EXECUTABLE_OUTPUT_PATH}/inkscape.exe ${EXECUTABLE_OUTPUT_PATH}/inkview.exe -- cgit v1.2.3