diff options
| author | Sebastian Faubel <sebastian@semiodesk.com> | 2016-07-06 15:45:34 +0000 |
|---|---|---|
| committer | Sebastian Faubel <sebastian@semiodesk.com> | 2016-07-06 15:45:34 +0000 |
| commit | 24ac45b8bad3a477e2af643c36a77d82916a2017 (patch) | |
| tree | 3ebefe18b2f3ff5c02b8cfa2dd4469c8c00cbd9d | |
| parent | Fixing build for Linux. (diff) | |
| download | inkscape-24ac45b8bad3a477e2af643c36a77d82916a2017.tar.gz inkscape-24ac45b8bad3a477e2af643c36a77d82916a2017.zip | |
Fixing build for Linux.
(bzr r15002.1.8)
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | 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
|