Fixing paths for SDL2 and Sixense libs

cmake/externals/sdl2/CMakeLists.txt

@@ -2,6 +2,8 @@ set(EXTERNAL_NAME sdl2)
 
 include(ExternalProject)
 
+string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
+
 if (WIN32)
   ExternalProject_Add(
     ${EXTERNAL_NAME}
@@ -13,15 +15,33 @@ if (WIN32)
     LOG_DOWNLOAD 1
   )
 elseif (APPLE)
-  ExternalProject_Add(
-    ${EXTERNAL_NAME}
-    URL http://hifi-public.s3.amazonaws.com/dependencies/SDL2-2.0.3-OSX.tar.gz
-    URL_MD5 64f888886268bdf1656ef1b4b7d7756d
-    CONFIGURE_COMMAND ""
-    BUILD_COMMAND ""
-    INSTALL_COMMAND ""
-    LOG_DOWNLOAD 1
-  )
+
+    ExternalProject_Add(
+      ${EXTERNAL_NAME}
+      URL https://hifi-public.s3.amazonaws.com/dependencies/SDL2-2.0.3.zip
+      CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DVIDEO_OPENGL=OFF
+      BINARY_DIR ${EXTERNAL_PROJECT_PREFIX}/build
+      LOG_DOWNLOAD 1
+      LOG_CONFIGURE 1
+      LOG_BUILD 1
+    )
+
+    ExternalProject_Get_Property(${EXTERNAL_NAME} INSTALL_DIR)
+    set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIR ${INSTALL_DIR}/include/SDL2 CACHE PATH "Location of SDL2 include directory")
+    set(${EXTERNAL_NAME_UPPER}_LIBRARY "${INSTALL_DIR}/lib/libSDL2-2.0.dylib" CACHE STRING "Path to SDL2 library")
+
+    set(_SDL2_LIB_DIR "${INSTALL_DIR}/lib")
+
+    ExternalProject_Add_Step(
+      ${EXTERNAL_NAME}
+      change-install-name
+      COMMENT "Calling install_name_tool on SDL2 libraries to fix install name for dylib linking"
+      COMMAND ${CMAKE_COMMAND} -DINSTALL_NAME_LIBRARY_DIR=${_SDL2_LIB_DIR} -P ${EXTERNAL_PROJECT_DIR}/OSXInstallNameChange.cmake
+      DEPENDEES install
+      WORKING_DIRECTORY <INSTALL_DIR>
+      LOG 1
+    )
+
 else ()
   if (ANDROID)
     set(ANDROID_CMAKE_ARGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}" "-DANDROID_NATIVE_API_LEVEL=19")
@@ -41,12 +61,8 @@ endif ()
 # Hide this external target (for ide users)
 set_target_properties(${EXTERNAL_NAME} PROPERTIES FOLDER "hidden/externals")
 
-string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
 
 if (APPLE)
-  ExternalProject_Get_Property(${EXTERNAL_NAME} SOURCE_DIR)
-  set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIR ${SOURCE_DIR}/SDL2.framework/Headers CACHE PATH "Location of SDL2 include directory")
-  set(${EXTERNAL_NAME_UPPER}_LIBRARY_TEMP ${SOURCE_DIR}/SDL2.framework/SDL2 CACHE STRING "Path to SDL2 library")
 elseif (WIN32)
   ExternalProject_Get_Property(${EXTERNAL_NAME} SOURCE_DIR)
   set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIR ${SOURCE_DIR}/include CACHE PATH "Location of SDL2 include directory")

cmake/externals/sixense/CMakeLists.txt

@@ -37,6 +37,18 @@ elseif(APPLE)
 
     set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/lib/osx_x64/release_dll/libsixense_x64.dylib CACHE TYPE INTERNAL)
 
+    set(_SIXENSE_LIB_DIR "${SOURCE_DIR}/lib/osx_x64/release_dll")
+
+    ExternalProject_Add_Step(
+      ${EXTERNAL_NAME}
+      change-install-name-release
+      COMMENT "Calling install_name_tool on libraries to fix install name for dylib linking"
+      COMMAND ${CMAKE_COMMAND} -DINSTALL_NAME_LIBRARY_DIR=${_SIXENSE_LIB_DIR} -P ${EXTERNAL_PROJECT_DIR}/OSXInstallNameChange.cmake
+      DEPENDEES install
+      WORKING_DIRECTORY <SOURCE_DIR>
+      LOG 1
+    )
+
 elseif(NOT ANDROID)
 
     # FIXME need to account for different architectures 

libraries/entities/CMakeLists.txt

@@ -1,6 +1,6 @@
 set(TARGET_NAME entities)
 setup_hifi_library(Network Script)
-link_hifi_libraries(avatars shared octree gpu model fbx networking animation environment)
+link_hifi_libraries(avatars shared audio octree gpu model fbx networking animation environment)
 
 target_bullet()
 

libraries/procedural/CMakeLists.txt

@@ -1,5 +1,5 @@
 set(TARGET_NAME procedural)
 AUTOSCRIBE_SHADER_LIB(gpu model)
 setup_hifi_library()
-link_hifi_libraries(shared gpu model model-networking)
+link_hifi_libraries(shared gpu networking model model-networking)