mirror of
https://github.com/overte-org/overte.git
synced 2025-08-07 00:19:40 +02:00
changes for cmake 3.12 and MacOS 10.14
This commit is contained in:
parent
e624b0ce8e
commit
eb7b7440bf
3 changed files with 12 additions and 12 deletions
14
cmake/externals/quazip/CMakeLists.txt
vendored
14
cmake/externals/quazip/CMakeLists.txt
vendored
|
@ -1,14 +1,12 @@
|
||||||
set(EXTERNAL_NAME quazip)
|
set(EXTERNAL_NAME quazip)
|
||||||
string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
|
string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
|
||||||
cmake_policy(SET CMP0046 OLD)
|
|
||||||
|
|
||||||
include(ExternalProject)
|
include(ExternalProject)
|
||||||
|
|
||||||
set(QUAZIP_CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${QT_CMAKE_PREFIX_PATH} -DCMAKE_INSTALL_NAME_DIR:PATH=<INSTALL_DIR>/lib -DZLIB_ROOT=${ZLIB_ROOT} -DCMAKE_POSITION_INDEPENDENT_CODE=ON)
|
set(QUAZIP_CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${QT_CMAKE_PREFIX_PATH} -DCMAKE_INSTALL_NAME_DIR:PATH=<INSTALL_DIR>/lib -DZLIB_ROOT=${ZLIB_ROOT} -DCMAKE_POSITION_INDEPENDENT_CODE=ON)
|
||||||
|
|
||||||
if (APPLE)
|
if (NOT APPLE)
|
||||||
else ()
|
set(QUAZIP_CMAKE_ARGS ${QUAZIP_CMAKE_ARGS} -DCMAKE_CXX_STANDARD=11)
|
||||||
set(QUAZIP_CMAKE_ARGS ${QUAZIP_CMAKE_ARGS} -DCMAKE_CXX_STANDARD=11)
|
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
ExternalProject_Add(
|
ExternalProject_Add(
|
||||||
|
@ -22,10 +20,12 @@ ExternalProject_Add(
|
||||||
LOG_BUILD 1
|
LOG_BUILD 1
|
||||||
)
|
)
|
||||||
|
|
||||||
add_dependencies(quazip zlib)
|
if (WIN32)
|
||||||
|
add_dependencies(quazip zlib)
|
||||||
|
endif ()
|
||||||
|
|
||||||
# Hide this external target (for ide users)
|
# Hide this external target (for ide users)
|
||||||
set_target_properties(${EXTERNAL_NAME} PROPERTIES
|
set_target_properties(${EXTERNAL_NAME} PROPERTIES
|
||||||
FOLDER "hidden/externals"
|
FOLDER "hidden/externals"
|
||||||
INSTALL_NAME_DIR ${INSTALL_DIR}/lib
|
INSTALL_NAME_DIR ${INSTALL_DIR}/lib
|
||||||
BUILD_WITH_INSTALL_RPATH True)
|
BUILD_WITH_INSTALL_RPATH True)
|
||||||
|
@ -54,4 +54,4 @@ select_library_configurations(${EXTERNAL_NAME_UPPER})
|
||||||
|
|
||||||
# Force selected libraries into the cache
|
# Force selected libraries into the cache
|
||||||
set(${EXTERNAL_NAME_UPPER}_LIBRARY ${${EXTERNAL_NAME_UPPER}_LIBRARY} CACHE FILEPATH "Location of QuaZip libraries")
|
set(${EXTERNAL_NAME_UPPER}_LIBRARY ${${EXTERNAL_NAME_UPPER}_LIBRARY} CACHE FILEPATH "Location of QuaZip libraries")
|
||||||
set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${${EXTERNAL_NAME_UPPER}_LIBRARIES} CACHE FILEPATH "Location of QuaZip libraries")
|
set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${${EXTERNAL_NAME_UPPER}_LIBRARIES} CACHE FILEPATH "Location of QuaZip libraries")
|
||||||
|
|
|
@ -3,11 +3,11 @@ if (WIN32)
|
||||||
endif (WIN32)
|
endif (WIN32)
|
||||||
|
|
||||||
if (POLICY CMP0043)
|
if (POLICY CMP0043)
|
||||||
cmake_policy(SET CMP0043 OLD)
|
cmake_policy(SET CMP0043 NEW)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
if (POLICY CMP0042)
|
if (POLICY CMP0042)
|
||||||
cmake_policy(SET CMP0042 OLD)
|
cmake_policy(SET CMP0042 NEW)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
|
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
|
||||||
|
@ -34,7 +34,7 @@ file(GLOB HIFI_CUSTOM_MACROS "cmake/macros/*.cmake")
|
||||||
foreach(CUSTOM_MACRO ${HIFI_CUSTOM_MACROS})
|
foreach(CUSTOM_MACRO ${HIFI_CUSTOM_MACROS})
|
||||||
include(${CUSTOM_MACRO})
|
include(${CUSTOM_MACRO})
|
||||||
endforeach()
|
endforeach()
|
||||||
unset(HIFI_CUSTOM_MACROS)
|
unset(HIFI_CUSTOM_MACROS)
|
||||||
|
|
||||||
if (ANDROID)
|
if (ANDROID)
|
||||||
set(BUILD_SHARED_LIBS ON)
|
set(BUILD_SHARED_LIBS ON)
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
#
|
#
|
||||||
# Copyright 2015 High Fidelity, Inc.
|
# Copyright 2015 High Fidelity, Inc.
|
||||||
# Created by Bradley Austin Davis on 2015/10/10
|
# Created by Bradley Austin Davis on 2015/10/10
|
||||||
#
|
#
|
||||||
# Distributed under the Apache License, Version 2.0.
|
# Distributed under the Apache License, Version 2.0.
|
||||||
# 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
|
||||||
#
|
#
|
||||||
macro(TARGET_ZLIB)
|
macro(TARGET_ZLIB)
|
||||||
|
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
|
|
Loading…
Reference in a new issue