Merge branch 'master' into revert-corrupt-image-files

2020-01-27 20:24:17 +01:00
parent 9e1eba7912 1e3f7137fa
commit 46faa1e523
1 changed files with 0 additions and 4 deletions
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -1213,10 +1213,6 @@ SET_TARGET_PROPERTIES( assimp PROPERTIES
 )

 if (APPLE)
-  SET_TARGET_PROPERTIES( assimp PROPERTIES
-    INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${ASSIMP_LIB_INSTALL_DIR}"
-  )
-
  if (BUILD_FRAMEWORK)
    SET_TARGET_PROPERTIES( assimp PROPERTIES
      FRAMEWORK TRUE