[aseprite] 92/134: Change the compilation output path to CMAKE_BINARY_DIR/bin and /lib

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit d1c0a61b40aaeedad7d1e2687f6a88883de08b0e
Author: David Capello <davidcapello at gmail.com>
Date:   Tue Dec 2 01:30:01 2014 -0300

    Change the compilation output path to CMAKE_BINARY_DIR/bin and /lib
---
 CMakeLists.txt | 18 ++++++++++++++++++
 INSTALL.md     |  7 +++----
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d7d29f6..74a73ef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,6 +82,24 @@ endif()
 ######################################################################
 # Directories
 
+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")
+# We need to specify the output for each configuration to make it work
+# on Visual Studio solutions.
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/lib")
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/lib")
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/bin")
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_BINARY_DIR}/lib")
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_BINARY_DIR}/lib")
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_BINARY_DIR}/bin")
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/lib")
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/lib")
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/bin")
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_PROFILE "${CMAKE_BINARY_DIR}/lib")
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_PROFILE "${CMAKE_BINARY_DIR}/lib")
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_PROFILE "${CMAKE_BINARY_DIR}/bin")
+
 set(CURL_DIR            ${CMAKE_SOURCE_DIR}/third_party/curl)
 set(GIFLIB_DIR          ${CMAKE_SOURCE_DIR}/third_party/giflib)
 set(LIBFREETYPE_DIR     ${CMAKE_SOURCE_DIR}/third_party/freetype)
diff --git a/INSTALL.md b/INSTALL.md
index c7bc21f..1e3acfb 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -53,11 +53,10 @@ the source code in a directory called `aseprite-source`):
    opening the solution, etc.
 
 4. When the project is compiled, you can copy the resulting executable
-   file (e.g. `build/src/aseprite.exe`) to `aseprite-source` and
+   file (e.g. `build/bin/aseprite.exe`) to `aseprite-source` and
    execute it. If you have used a Visual Studio project, you can copy
-   the whole `data/` directory to `build/src/RelWithDebInfo/` so you
-   can run/debug the program from Visual Studio IDE. On Linux, you can
-   copy the `data/` directory in `~/.aseprite/` directory.
+   the whole `data/` directory to `build/bin/` so you can run/debug
+   the program from Visual Studio IDE.
 
 ## Mac OS X details
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git