Merge branch 'master' into hl1-mdl-fix-texture-format

2020-01-27 18:01:03 -05:00
parent 5ab67f6491 e41a59ee1f
commit 16d71908d7
55 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