From 2a1459b27b170e42a402e55056fadaf3b2da1174 Mon Sep 17 00:00:00 2001 From: halx99 Date: Sat, 24 Apr 2021 23:51:23 +0800 Subject: [PATCH] Update cmake & readme --- external/CMakeLists.txt | 10 +++++++++- external/README.md | 2 +- external/c-ares/src/CMakeLists.txt | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index f740dcb6b8..2f775f3450 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -63,9 +63,10 @@ if(BUILD_EXT_BOX2D) set_target_properties(box2d PROPERTIES ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" FOLDER "External" ) - target_link_libraries(external box2d) + target_link_libraries(external box2d) endif(BUILD_EXT_BOX2D) if(BUILD_EXT_CHIPMUNK) @@ -290,6 +291,13 @@ if(BUILD_EXT_CARES) target_link_libraries(external c-ares) include_directories($) include_directories("c-ares/include") + set_target_properties(c-ares + PROPERTIES + ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" + FOLDER "External" + ) endif(BUILD_EXT_CARES) # put "external" into External folder, too diff --git a/external/README.md b/external/README.md index 6f8b0ef155..595be79903 100644 --- a/external/README.md +++ b/external/README.md @@ -21,7 +21,7 @@ ## c-ares - Upstream: https://github.com/c-ares/c-ares -- Version: 1.17.1 +- Version: 1.17.1-809d5e8 (2055) - License: MIT ## Chipmunk2D diff --git a/external/c-ares/src/CMakeLists.txt b/external/c-ares/src/CMakeLists.txt index 6750c1780f..c62f3da9a7 100644 --- a/external/c-ares/src/CMakeLists.txt +++ b/external/c-ares/src/CMakeLists.txt @@ -1,2 +1,2 @@ ADD_SUBDIRECTORY (lib) -ADD_SUBDIRECTORY (tools) +# ADD_SUBDIRECTORY (tools)