From 19e7df5631fdad369dca3a8ecb6f1fb6d377a22e Mon Sep 17 00:00:00 2001 From: Akash Mozumdar Date: Sat, 22 Dec 2018 16:11:41 -0500 Subject: [PATCH] flatten build directories --- CMakeLists.txt | 6 +++--- deploy.ps1 | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index daa38ee..f86dacf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,10 +18,10 @@ add_definitions( include_directories(include) -if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8") - set(CMAKE_FINAL_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/Builds/${CMAKE_BUILD_TYPE}/x64) +if(${CMAKE_SIZEOF_VOID_P} STREQUAL "8") + set(CMAKE_FINAL_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/Builds/${CMAKE_BUILD_TYPE}_x64) else() - set(CMAKE_FINAL_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/Builds/${CMAKE_BUILD_TYPE}/x86) + set(CMAKE_FINAL_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/Builds/${CMAKE_BUILD_TYPE}_x86) endif() set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_FINAL_OUTPUT_DIRECTORY}) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_FINAL_OUTPUT_DIRECTORY}) diff --git a/deploy.ps1 b/deploy.ps1 index 8fc5f4f..99288ea 100644 --- a/deploy.ps1 +++ b/deploy.ps1 @@ -1,4 +1,4 @@ -cd Builds/RelWithDebInfo/x86; +cd Builds/RelWithDebInfo_x86; Compress-Archive -Force -DestinationPath Textractor -Path @( "Textractor.exe", "styles", @@ -16,7 +16,7 @@ Compress-Archive -Force -DestinationPath Textractor -Path @( "Extensions.txt" ) -cd ../x64; +cd ../RelWithDebInfo_x64; Compress-Archive -Force -DestinationPath Textractor -Path @( "Textractor.exe", "styles",