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 | |
| 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
| -rw-r--r-- | CMakeScripts/InstallMSYS2.cmake | 16 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 22 |
2 files changed, 13 insertions, 25 deletions
diff --git a/CMakeScripts/InstallMSYS2.cmake b/CMakeScripts/InstallMSYS2.cmake index f19f19417..36fd94264 100644 --- a/CMakeScripts/InstallMSYS2.cmake +++ b/CMakeScripts/InstallMSYS2.cmake @@ -123,16 +123,16 @@ if(WIN32) ${MINGW_BIN}/tcl[0-9]*.dll
${MINGW_BIN}/tk[0-9]*.dll
${MINGW_BIN}/zlib1.dll)
- INSTALL(FILES ${MINGW_LIBS} DESTINATION .)
+ INSTALL(FILES ${MINGW_LIBS} DESTINATION bin)
# There are differences for 64-Bit and 32-Bit build environments.
if(HAVE_MINGW64)
install(FILES
${MINGW_BIN}/libgcc_s_seh-1.dll
- DESTINATION .)
+ DESTINATION bin)
else()
install(FILES
${MINGW_BIN}/libgcc_s_dw2-1.dll
- DESTINATION .)
+ DESTINATION bin)
endif()
# Install hicolor/index.theme to avoid bug 1635207
@@ -223,26 +223,26 @@ if(WIN32) install(FILES
${MINGW_BIN}/gspawn-win64-helper.exe
${MINGW_BIN}/gspawn-win64-helper-console.exe
- DESTINATION .)
+ DESTINATION bin)
else()
install(FILES
${MINGW_BIN}/gspawn-win32-helper.exe
${MINGW_BIN}/gspawn-win32-helper-console.exe
- DESTINATION .)
+ DESTINATION bin)
endif()
# Python (a bit hacky for backwards compatibility with devlibs at this point)
install(FILES
${MINGW_BIN}/python2.exe
RENAME python.exe
- DESTINATION .)
+ DESTINATION bin)
install(FILES
${MINGW_BIN}/python2w.exe
RENAME pythonw.exe
- DESTINATION .)
+ DESTINATION bin)
install(FILES
${MINGW_BIN}/libpython2.7.dll
- DESTINATION .)
+ DESTINATION bin)
install(DIRECTORY ${MINGW_LIB}/python2.7
DESTINATION lib
PATTERN "python2.7/site-packages" EXCLUDE # specify individual packages to install below
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() |