Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 00:17:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Checkpoint

Browse source
This commit is contained in:
Leonardo Murillo 2016-07-15 12:04:45 -06:00
parent f0db7b9d39
commit 53d524eb2f
3 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/externals/hifiAudioCodec/CMakeLists.txt vendored
View file

@ -23,7 +23,7 @@ ExternalProject_Get_Property(${EXTERNAL_NAME} SOURCE_DIR)
set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${SOURCE_DIR}/include CACHE TYPE INTERNAL) set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${SOURCE_DIR}/include CACHE TYPE INTERNAL)
if (WIN32) 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) elseif(APPLE)
set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/Release/libaudio.a CACHE TYPE INTERNAL) set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/Release/libaudio.a CACHE TYPE INTERNAL)
elseif(NOT ANDROID) elseif(NOT ANDROID)

5
cmake/macros/AddDependencyExternalProjects.cmake
View file

@ -17,10 +17,12 @@ macro(ADD_DEPENDENCY_EXTERNAL_PROJECTS)
# has the user told us they specific don't want this as an external project? # has the user told us they specific don't want this as an external project?
if (NOT USE_LOCAL_${_PROJ_NAME_UPPER}) 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? # 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) if (NOT DEFINED ${_PROJ_NAME_UPPER}_EXTERNAL_PROJECT OR ${_PROJ_NAME_UPPER}_EXTERNAL_PROJECT)
# have we already setup the target? # have we already setup the target?
if (NOT TARGET ${_PROJ_NAME}) 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}) add_subdirectory(${EXTERNAL_PROJECT_DIR}/${_PROJ_NAME} ${EXTERNALS_BINARY_DIR}/${_PROJ_NAME})
# did we end up adding an external project target? # did we end up adding an external project target?
@ -35,6 +37,7 @@ macro(ADD_DEPENDENCY_EXTERNAL_PROJECTS)
endif () endif ()
if (TARGET ${_PROJ_NAME}) if (TARGET ${_PROJ_NAME})
message(STATUS "LEODEBUG: We no have the target ${_PROJ_NAME}")
add_dependencies(${TARGET_NAME} ${_PROJ_NAME}) add_dependencies(${TARGET_NAME} ${_PROJ_NAME})
endif () endif ()
@ -43,4 +46,4 @@ macro(ADD_DEPENDENCY_EXTERNAL_PROJECTS)
endforeach() endforeach()
endmacro() endmacro()

18
plugins/hifiCodec/CMakeLists.txt
View file

@ -6,15 +6,11 @@
# See the accompanying file LICENSE or http:#www.apache.org/licenses/LICENSE-2.0.html # See the accompanying file LICENSE or http:#www.apache.org/licenses/LICENSE-2.0.html
# #
if (WIN32 OR APPLE) set(TARGET_NAME hifiCodec)
set(TARGET_NAME hifiCodec) setup_hifi_client_server_plugin()
setup_hifi_client_server_plugin() link_hifi_libraries(audio shared plugins)
add_dependency_external_projects(hifiAudioCodec)
link_hifi_libraries(audio shared plugins) target_include_directories(${TARGET_NAME} PRIVATE ${HIFIAUDIOCODEC_INCLUDE_DIRS})
target_link_libraries(${TARGET_NAME} ${HIFIAUDIOCODEC_LIBRARIES})
add_dependency_external_projects(HiFiAudioCodec) install_beside_console()
target_include_directories(${TARGET_NAME} PRIVATE ${HIFIAUDIOCODEC_INCLUDE_DIRS})
target_link_libraries(${TARGET_NAME} ${HIFIAUDIOCODEC_LIBRARIES})
install_beside_console()
endif()