diff --git a/CMakeLists.txt b/CMakeLists.txt index 3bf25cc..1d3ab63 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,9 +52,9 @@ set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) -set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/CMake") -set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/CMake") -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/CMake") +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") if(DEFINED VCPKG_TARGET_ARCHITECTURE) set(DIRECTX_ARCH ${VCPKG_TARGET_ARCHITECTURE}) @@ -668,6 +668,13 @@ if(BUILD_TOOLS AND BUILD_DX11 AND WIN32) set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT texconv) endif() +if(BUILD_TOOLS AND (NOT VCPKG_TOOLCHAIN)) + foreach(t IN LISTS TOOL_EXES) + install(TARGETS ${t} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + endforeach() +endif() + #--- Test suite include(CTest) if(BUILD_TESTING AND WIN32 AND (NOT WINDOWS_STORE) AND (NOT (DEFINED XBOX_CONSOLE_TARGET))