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})