From 04c17e53e4afd53bb78fad098adecc8aebb5b42f Mon Sep 17 00:00:00 2001 From: hyzboy Date: Sun, 31 Mar 2019 23:16:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A0=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=97=B6=E7=9A=84=E8=BE=93=E5=87=BA=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=E6=8C=87=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 1 - cmake/output_path.cmake | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 91af3163..34680546 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,4 @@ cmake_minimum_required(VERSION 3.0) -SET(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE) PROJECT(ULRE) diff --git a/cmake/output_path.cmake b/cmake/output_path.cmake index 3cb0a89a..b435b2f8 100644 --- a/cmake/output_path.cmake +++ b/cmake/output_path.cmake @@ -1,4 +1,4 @@ -macro(set_output_directory) +macro(set_output_directory) IF(ANDROID) SET(OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/out/android/${ANDROID_ABI}) @@ -18,6 +18,10 @@ macro(set_output_directory) SET(OUTPUT_DIRECTORY_DEBUG ${OUTPUT_DIRECTORY}_Debug) SET(OUTPUT_DIRECTORY_RELEASE ${OUTPUT_DIRECTORY}_Release) + SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${OUTPUT_DIRECTORY}) + SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${OUTPUT_DIRECTORY}) + SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_DIRECTORY}) + SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${OUTPUT_DIRECTORY_DEBUG}) SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${OUTPUT_DIRECTORY_DEBUG}) SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG ${OUTPUT_DIRECTORY_DEBUG})