diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-07-06 08:09:31 +0800 | 
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-07-06 08:09:31 +0800 | 
| commit | 57f91acf044a3cf2c8a0175aab10fbb7b1e90a7f (patch) | |
| tree | 805c3e55d83094fa2010ee66bcd2b6a204736f42 /indra/cmake | |
| parent | 29d68ecb229ecb19e6d0da4cf5fbd8e3bbdde2cf (diff) | |
| parent | 8662083cf4130922732aa8fba655310664b80d8b (diff) | |
Merge branch 'main' into maint-b
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/UnixInstall.cmake | 88 | 
1 files changed, 60 insertions, 28 deletions
| diff --git a/indra/cmake/UnixInstall.cmake b/indra/cmake/UnixInstall.cmake index a748237c5b..59620b60b4 100644 --- a/indra/cmake/UnixInstall.cmake +++ b/indra/cmake/UnixInstall.cmake @@ -6,32 +6,64 @@ set(INSTALL OFF CACHE BOOL      "Generate install target.")  if (INSTALL) -  set(INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH -      "Top-level installation directory.") - -  if (EXISTS ${CMAKE_SYSROOT}/usr/lib/${ARCH}-linux-gnu) -    set(_LIB lib/${ARCH}-linux-gnu) -  elseif (EXISTS /lib64) -    set(_LIB lib64) -  else () -    set(_LIB lib) -  endif () - -  set(INSTALL_LIBRARY_DIR ${INSTALL_PREFIX}/${_LIB} CACHE PATH -      "Installation directory for read-only shared files.") - -  set(INSTALL_SHARE_DIR ${INSTALL_PREFIX}/share CACHE PATH -      "Installation directory for read-only shared files.") - -  set(APP_BINARY_DIR ${INSTALL_PREFIX}/bin -      CACHE PATH -      "Installation directory for binaries.") - -  set(APP_SHARE_DIR ${INSTALL_SHARE_DIR}/${VIEWER_BINARY_NAME} -      CACHE PATH -      "Installation directory for read-only data files.") - -  set(APP_LIBEXEC_DIR ${INSTALL_PREFIX}/libexec/${VIEWER_BINARY_NAME} -      CACHE PATH -      "Installation directory for non-manual executables.") + +  if (DARWIN) + +    set(INSTALL_PREFIX +        ${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents +        CACHE PATH +        "Top-level installation directory.") + +    set(INSTALL_LIBRARY_DIR ${INSTALL_PREFIX}/Resources +        CACHE PATH +        "Installation directory for read-only shared files.") + +    set(INSTALL_SHARE_DIR ${INSTALL_LIBRARY_DIR} CACHE PATH +        "Installation directory for read-only shared files.") + +    set(APP_BINARY_DIR ${INSTALL_PREFIX}/MacOS +        CACHE PATH +        "Installation directory for binaries.") + +    set(APP_SHARE_DIR ${INSTALL_SHARE_DIR} +        CACHE PATH +        "Installation directory for read-only data files.") + +    set(APP_LIBEXEC_DIR ${INSTALL_LIBRARY_DIR} +        CACHE PATH +        "Installation directory for non-manual executables.") + +  else (DARWIN) + +    set(INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH +        "Top-level installation directory.") + +    if (EXISTS ${CMAKE_SYSROOT}/usr/lib/${ARCH}-linux-gnu) +      set(_LIB lib/${ARCH}-linux-gnu) +    elseif (EXISTS /lib64) +      set(_LIB lib64) +    else () +      set(_LIB lib) +    endif () + +    set(INSTALL_LIBRARY_DIR ${INSTALL_PREFIX}/${_LIB} CACHE PATH +        "Installation directory for read-only shared files.") + +    set(INSTALL_SHARE_DIR ${INSTALL_PREFIX}/share CACHE PATH +        "Installation directory for read-only shared files.") + +    set(APP_BINARY_DIR ${INSTALL_PREFIX}/bin +        CACHE PATH +        "Installation directory for binaries.") + +    set(APP_SHARE_DIR ${INSTALL_SHARE_DIR}/${VIEWER_BINARY_NAME} +        CACHE PATH +        "Installation directory for read-only data files.") + +    set(APP_LIBEXEC_DIR ${INSTALL_PREFIX}/libexec/${VIEWER_BINARY_NAME} +        CACHE PATH +        "Installation directory for non-manual executables.") + +  endif (DARWIN) +  endif (INSTALL) | 
