diff options
author | Vojtech Kral <vojtech@kral.hk> | 2019-09-02 13:16:15 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-02 13:16:15 +0300 |
commit | bc6bb85d65a4e021183c1aa5e480be5aa20028a9 (patch) | |
tree | 35fa7b1705dd576994e0679193409d8557437f74 /CMakeLists.txt | |
parent | bbfe420769e1e9480d5fd355fd1ac66465d91f4d (diff) | |
parent | b5ff4bbb5213b7d87840715d8979ac51ddb74cbc (diff) |
Merge pull request #2646 from labsin/no_FHS_build
Only set SLIC3R_FHS_RESOURCES when SLIC3R_FHS is set
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3fac3daaf..8c7fc12df 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -398,8 +398,10 @@ endif() # Resources install target, configure fhs.hpp on UNIX if (WIN32) install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${CMAKE_INSTALL_PREFIX}/resources") -else () +elseif (SLIC3R_FHS) set(SLIC3R_FHS_RESOURCES "${CMAKE_INSTALL_FULL_DATAROOTDIR}/PrusaSlicer") install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${SLIC3R_FHS_RESOURCES}") +else () + install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${CMAKE_INSTALL_PREFIX}/resources") endif () configure_file(${LIBDIR}/platform/unix/fhs.hpp.in ${LIBDIR_BIN}/platform/unix/fhs.hpp) |