diff options
| -rw-r--r-- | indra/cmake/NDOF.cmake | 38 |
1 files changed, 2 insertions, 36 deletions
diff --git a/indra/cmake/NDOF.cmake b/indra/cmake/NDOF.cmake index 50f0ea1f51..e98a03bab4 100644 --- a/indra/cmake/NDOF.cmake +++ b/indra/cmake/NDOF.cmake @@ -7,42 +7,8 @@ include_guard() add_library( ll::ndof INTERFACE IMPORTED ) if (NDOF) - if (WINDOWS) + if (WINDOWS OR DARWIN) use_prebuilt_binary(libndofdev) - elseif (DARWIN) - if (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/libndofdev_installed OR NOT ${libndofdev_installed} EQUAL 0) - file(DOWNLOAD - https://github.com/secondlife/3p-libndofdev/archive/refs/tags/v0.1.8e9edc7.tar.gz - ${CMAKE_BINARY_DIR}/3p-libndofdev-0.1.8e9edc7.tar.gz - ) - file(ARCHIVE_EXTRACT - INPUT ${CMAKE_BINARY_DIR}/3p-libndofdev-0.1.8e9edc7.tar.gz - DESTINATION ${CMAKE_BINARY_DIR} - ) - try_compile(LIBNDOFDEV_RESULT - PROJECT libndofdev - SOURCE_DIR ${CMAKE_BINARY_DIR}/3p-libndofdev-0.1.8e9edc7/libndofdev - BINARY_DIR ${CMAKE_BINARY_DIR}/3p-libndofdev-0.1.8e9edc7/libndofdev - TARGET ndofdev - CMAKE_FLAGS - -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} - -DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHITECTURES} - -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${CMAKE_OSX_DEPLOYMENT_TARGET} - -DCMAKE_C_FLAGS:STRING=-DTARGET_OS_MAC\ -Wno-int-conversion - OUTPUT_VARIABLE libndofdev_installed - ) - if (${LIBNDOFDEV_RESULT}) - file( - COPY ${CMAKE_BINARY_DIR}/3p-libndofdev-0.1.8e9edc7/libndofdev/src/ndofdev_external.h - DESTINATION ${LIBS_PREBUILT_DIR}/include - ) - file( - COPY ${CMAKE_BINARY_DIR}/3p-libndofdev-0.1.8e9edc7/libndofdev/src/libndofdev.dylib - DESTINATION ${ARCH_PREBUILT_DIRS_RELEASE} - ) - file(WRITE ${PREBUILD_TRACKING_DIR}/libndofdev_installed "${libndofdev_installed}") - endif () - endif () elseif (LINUX) if (CMAKE_SYSTEM_PROCESSOR MATCHES x86_64) use_prebuilt_binary(open-libndofdev) @@ -74,7 +40,7 @@ if (NDOF) file(WRITE ${PREBUILD_TRACKING_DIR}/libndofdev_installed "${libndofdev_installed}") endif () endif () - endif () + endif (WINDOWS OR DARWIN) find_library(NDOF_LIBRARY NAMES |