From 5716f576b7f899296b807be99df409cdecb1c826 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 21 Jan 2015 13:30:28 -0800 Subject: [PATCH] output archive to current binary dir --- CMakeLists.txt | 3 +-- cmake/android/QtCreateAPK.cmake | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9fb36077e1..b45223662c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,8 +68,7 @@ if (ANDROID) endif () set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH) - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) - set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib) if (ANDROID_LIB_DIR) list(APPEND CMAKE_FIND_ROOT_PATH ${ANDROID_LIB_DIR}) diff --git a/cmake/android/QtCreateAPK.cmake b/cmake/android/QtCreateAPK.cmake index ea93cdd4b2..e43a03eab9 100644 --- a/cmake/android/QtCreateAPK.cmake +++ b/cmake/android/QtCreateAPK.cmake @@ -77,7 +77,6 @@ macro(qt_create_apk) get_property(_DEP_DEPENDENCIES TARGET ${_DEP} PROPERTY INTERFACE_LINK_LIBRARIES) foreach(_SUB_DEP IN LISTS _DEP_DEPENDENCIES) - message("${_SUB_DEP} is a DEP of ${DEP}") if (NOT TARGET ${_SUB_DEP} AND NOT _SUB_DEP MATCHES "Qt5::.*") list(APPEND _DEPS_LIST ${_SUB_DEP}) endif()