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

allow sep specification of android Qt location on system

Browse source
This commit is contained in:
Stephen Birarda 2014-11-13 15:35:19 -08:00
parent e509a4c41a
commit 63304210c1
2 changed files with 1774 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
CMakeLists.txt
View file

@ -34,8 +34,15 @@ elseif (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fno-strict-aliasing") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fno-strict-aliasing")
endif(WIN32) endif(WIN32)
if (NOT QT_CMAKE_PREFIX_PATH) if (ANDROID)
set(QT_CMAKE_PREFIX_PATH $ENV{QT_CMAKE_PREFIX_PATH}) if (NOT ANDROID_QT_CMAKE_PREFIX_PATH)
set(QT_CMAKE_PREFIX_PATH $ENV{ANDROID_QT_CMAKE_PREFIX_PATH})
message(${QT_CMAKE_PREFIX_PATH})
endif ()
elseif ()
if (NOT QT_CMAKE_PREFIX_PATH)
set(QT_CMAKE_PREFIX_PATH $ENV{QT_CMAKE_PREFIX_PATH})
endif ()
endif () endif ()
set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${QT_CMAKE_PREFIX_PATH}) set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${QT_CMAKE_PREFIX_PATH})
@ -60,11 +67,14 @@ foreach(CUSTOM_MACRO ${HIFI_CUSTOM_MACROS})
include(${CUSTOM_MACRO}) include(${CUSTOM_MACRO})
endforeach() endforeach()
# targets on all platforms # add subdirectories for all targets
add_subdirectory(assignment-client) add_subdirectory(assignment-client)
if (NOT ANDROID)
add_subdirectory(domain-server) add_subdirectory(domain-server)
add_subdirectory(ice-server) add_subdirectory(ice-server)
add_subdirectory(interface) add_subdirectory(interface)
add_subdirectory(tests) add_subdirectory(tests)
add_subdirectory(tools) add_subdirectory(tools)
add_subdirectory(voxel-edit) add_subdirectory(voxel-edit)
endif ()

1761
cmake/android/android.toolchain.cmake Normal file
View file

File diff suppressed because it is too large Load diff