From f0db7b9d39e5b2da679515aa3fe0a3c471d0055a Mon Sep 17 00:00:00 2001 From: Leonardo Murillo Date: Fri, 15 Jul 2016 11:42:30 -0600 Subject: [PATCH 1/4] Checkpoint --- cmake/externals/hifiAudioCodec/CMakeLists.txt | 8 +++----- cmake/macros/SetupHifiClientServerPlugin.cmake | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/cmake/externals/hifiAudioCodec/CMakeLists.txt b/cmake/externals/hifiAudioCodec/CMakeLists.txt index 3a8c714d79..642a58b685 100644 --- a/cmake/externals/hifiAudioCodec/CMakeLists.txt +++ b/cmake/externals/hifiAudioCodec/CMakeLists.txt @@ -1,13 +1,13 @@ include(ExternalProject) include(SelectLibraryConfigurations) -set(EXTERNAL_NAME HiFiAudioCodec) +set(EXTERNAL_NAME hifiAudioCodec) string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER) ExternalProject_Add( ${EXTERNAL_NAME} - URL https://s3.amazonaws.com/hifi-public/dependencies/codecSDK-1.zip + URL http://s3.amazonaws.com/hifi-public/dependencies/codecSDK-1.zip URL_MD5 23ec3fe51eaa155ea159a4971856fc13 CONFIGURE_COMMAND "" BUILD_COMMAND "" @@ -27,7 +27,5 @@ if (WIN32) elseif(APPLE) set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/Release/libaudio.a CACHE TYPE INTERNAL) elseif(NOT ANDROID) - # FIXME need to account for different architectures - #set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/lib/linux64/audio.so CACHE TYPE INTERNAL) + set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/lib/linux64/audio.so CACHE TYPE INTERNAL) endif() - diff --git a/cmake/macros/SetupHifiClientServerPlugin.cmake b/cmake/macros/SetupHifiClientServerPlugin.cmake index 8ba38a09c3..74ceaeb0ab 100644 --- a/cmake/macros/SetupHifiClientServerPlugin.cmake +++ b/cmake/macros/SetupHifiClientServerPlugin.cmake @@ -37,7 +37,7 @@ macro(SETUP_HIFI_CLIENT_SERVER_PLUGIN) ${CLIENT_PLUGIN_FULL_PATH} ) # copy the client plugin binaries - add_custom_command(TARGET ${DIR} POST_BUILD + add_custom_command(TARGET ${TARGET_NAME} POST_BUILD COMMAND "${CMAKE_COMMAND}" -E copy "$" ${CLIENT_PLUGIN_FULL_PATH} @@ -50,7 +50,7 @@ macro(SETUP_HIFI_CLIENT_SERVER_PLUGIN) ${SERVER_PLUGIN_FULL_PATH} ) # copy the server plugin binaries - add_custom_command(TARGET ${DIR} POST_BUILD + add_custom_command(TARGET ${TARGET_NAME} POST_BUILD COMMAND "${CMAKE_COMMAND}" -E copy "$" ${SERVER_PLUGIN_FULL_PATH} From 53d524eb2fe40668424aac9feb1a0d0c1cb01e15 Mon Sep 17 00:00:00 2001 From: Leonardo Murillo Date: Fri, 15 Jul 2016 12:04:45 -0600 Subject: [PATCH 2/4] Checkpoint --- cmake/externals/hifiAudioCodec/CMakeLists.txt | 2 +- .../macros/AddDependencyExternalProjects.cmake | 5 ++++- plugins/hifiCodec/CMakeLists.txt | 18 +++++++----------- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/cmake/externals/hifiAudioCodec/CMakeLists.txt b/cmake/externals/hifiAudioCodec/CMakeLists.txt index 642a58b685..8a1b07253a 100644 --- a/cmake/externals/hifiAudioCodec/CMakeLists.txt +++ b/cmake/externals/hifiAudioCodec/CMakeLists.txt @@ -23,7 +23,7 @@ ExternalProject_Get_Property(${EXTERNAL_NAME} SOURCE_DIR) set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${SOURCE_DIR}/include CACHE TYPE INTERNAL) if (WIN32) - set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/Release/audio.lib CACHE TYPE INTERNAL) + set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/Release/audio.lib CACHE TYPE INTERNAL) elseif(APPLE) set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/Release/libaudio.a CACHE TYPE INTERNAL) elseif(NOT ANDROID) diff --git a/cmake/macros/AddDependencyExternalProjects.cmake b/cmake/macros/AddDependencyExternalProjects.cmake index e35ca98959..3cbb961308 100644 --- a/cmake/macros/AddDependencyExternalProjects.cmake +++ b/cmake/macros/AddDependencyExternalProjects.cmake @@ -17,10 +17,12 @@ macro(ADD_DEPENDENCY_EXTERNAL_PROJECTS) # has the user told us they specific don't want this as an external project? if (NOT USE_LOCAL_${_PROJ_NAME_UPPER}) + message(STATUS "LEODEBUG: Looking for dependency ${_PROJ_NAME}") # have we already detected we can't have this as external project on this OS? if (NOT DEFINED ${_PROJ_NAME_UPPER}_EXTERNAL_PROJECT OR ${_PROJ_NAME_UPPER}_EXTERNAL_PROJECT) # have we already setup the target? if (NOT TARGET ${_PROJ_NAME}) + message(STATUS "LEODEBUG: We dont have a target with that name ${_PROJ_NAME} adding directory ${EXTERNAL_PROJECT_DIR}/${_PROJ_NAME}") add_subdirectory(${EXTERNAL_PROJECT_DIR}/${_PROJ_NAME} ${EXTERNALS_BINARY_DIR}/${_PROJ_NAME}) # did we end up adding an external project target? @@ -35,6 +37,7 @@ macro(ADD_DEPENDENCY_EXTERNAL_PROJECTS) endif () if (TARGET ${_PROJ_NAME}) + message(STATUS "LEODEBUG: We no have the target ${_PROJ_NAME}") add_dependencies(${TARGET_NAME} ${_PROJ_NAME}) endif () @@ -43,4 +46,4 @@ macro(ADD_DEPENDENCY_EXTERNAL_PROJECTS) endforeach() -endmacro() \ No newline at end of file +endmacro() diff --git a/plugins/hifiCodec/CMakeLists.txt b/plugins/hifiCodec/CMakeLists.txt index 0af7e42ea1..b278e839e4 100644 --- a/plugins/hifiCodec/CMakeLists.txt +++ b/plugins/hifiCodec/CMakeLists.txt @@ -6,15 +6,11 @@ # See the accompanying file LICENSE or http:#www.apache.org/licenses/LICENSE-2.0.html # -if (WIN32 OR APPLE) - set(TARGET_NAME hifiCodec) - setup_hifi_client_server_plugin() - - link_hifi_libraries(audio shared plugins) - - add_dependency_external_projects(HiFiAudioCodec) - target_include_directories(${TARGET_NAME} PRIVATE ${HIFIAUDIOCODEC_INCLUDE_DIRS}) - target_link_libraries(${TARGET_NAME} ${HIFIAUDIOCODEC_LIBRARIES}) - install_beside_console() -endif() +set(TARGET_NAME hifiCodec) +setup_hifi_client_server_plugin() +link_hifi_libraries(audio shared plugins) +add_dependency_external_projects(hifiAudioCodec) +target_include_directories(${TARGET_NAME} PRIVATE ${HIFIAUDIOCODEC_INCLUDE_DIRS}) +target_link_libraries(${TARGET_NAME} ${HIFIAUDIOCODEC_LIBRARIES}) +install_beside_console() From b0c27a53e2b2d7c2dc0434484bb217638d1e4a50 Mon Sep 17 00:00:00 2001 From: Leonardo Murillo Date: Fri, 15 Jul 2016 13:01:21 -0600 Subject: [PATCH 3/4] Linking to Linux only SDK --- cmake/externals/hifiAudioCodec/CMakeLists.txt | 32 +++++++++++++------ 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/cmake/externals/hifiAudioCodec/CMakeLists.txt b/cmake/externals/hifiAudioCodec/CMakeLists.txt index 8a1b07253a..87b5044b42 100644 --- a/cmake/externals/hifiAudioCodec/CMakeLists.txt +++ b/cmake/externals/hifiAudioCodec/CMakeLists.txt @@ -5,15 +5,27 @@ set(EXTERNAL_NAME hifiAudioCodec) string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER) -ExternalProject_Add( - ${EXTERNAL_NAME} - URL http://s3.amazonaws.com/hifi-public/dependencies/codecSDK-1.zip - URL_MD5 23ec3fe51eaa155ea159a4971856fc13 - CONFIGURE_COMMAND "" - BUILD_COMMAND "" - INSTALL_COMMAND "" - LOG_DOWNLOAD 1 -) +if (WIN32 OR APPLE) + ExternalProject_Add( + ${EXTERNAL_NAME} + URL http://s3.amazonaws.com/hifi-public/dependencies/codecSDK-1.zip + URL_MD5 23ec3fe51eaa155ea159a4971856fc13 + CONFIGURE_COMMAND "" + BUILD_COMMAND "" + INSTALL_COMMAND "" + LOG_DOWNLOAD 1 + ) +elseif(NOT ANDROID) + ExternalProject_Add( + ${EXTERNAL_NAME} + URL http://s3.amazonaws.com/hifi-public/dependencies/codecSDK-linux.zip + URL_MD5 7d37914a18aa4de971d2f45dd3043bde + CONFIGURE_COMMAND "" + BUILD_COMMAND "" + INSTALL_COMMAND "" + LOG_DOWNLOAD 1 + ) +endif() # Hide this external target (for ide users) set_target_properties(${EXTERNAL_NAME} PROPERTIES FOLDER "hidden/externals") @@ -27,5 +39,5 @@ if (WIN32) elseif(APPLE) set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/Release/libaudio.a CACHE TYPE INTERNAL) elseif(NOT ANDROID) - set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/lib/linux64/audio.so CACHE TYPE INTERNAL) + set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/Release/libaudio.a CACHE TYPE INTERNAL) endif() From ce67d57279209593daa18c033c1e601450273f0f Mon Sep 17 00:00:00 2001 From: Leonardo Murillo Date: Fri, 15 Jul 2016 13:03:40 -0600 Subject: [PATCH 4/4] Removing Debugs --- cmake/macros/AddDependencyExternalProjects.cmake | 3 --- 1 file changed, 3 deletions(-) diff --git a/cmake/macros/AddDependencyExternalProjects.cmake b/cmake/macros/AddDependencyExternalProjects.cmake index 3cbb961308..99b8317fd7 100644 --- a/cmake/macros/AddDependencyExternalProjects.cmake +++ b/cmake/macros/AddDependencyExternalProjects.cmake @@ -17,12 +17,10 @@ macro(ADD_DEPENDENCY_EXTERNAL_PROJECTS) # has the user told us they specific don't want this as an external project? if (NOT USE_LOCAL_${_PROJ_NAME_UPPER}) - message(STATUS "LEODEBUG: Looking for dependency ${_PROJ_NAME}") # have we already detected we can't have this as external project on this OS? if (NOT DEFINED ${_PROJ_NAME_UPPER}_EXTERNAL_PROJECT OR ${_PROJ_NAME_UPPER}_EXTERNAL_PROJECT) # have we already setup the target? if (NOT TARGET ${_PROJ_NAME}) - message(STATUS "LEODEBUG: We dont have a target with that name ${_PROJ_NAME} adding directory ${EXTERNAL_PROJECT_DIR}/${_PROJ_NAME}") add_subdirectory(${EXTERNAL_PROJECT_DIR}/${_PROJ_NAME} ${EXTERNALS_BINARY_DIR}/${_PROJ_NAME}) # did we end up adding an external project target? @@ -37,7 +35,6 @@ macro(ADD_DEPENDENCY_EXTERNAL_PROJECTS) endif () if (TARGET ${_PROJ_NAME}) - message(STATUS "LEODEBUG: We no have the target ${_PROJ_NAME}") add_dependencies(${TARGET_NAME} ${_PROJ_NAME}) endif ()