diff options
author | Petr Mrázek <peterix@gmail.com> | 2016-05-01 03:49:46 +0200 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2016-05-01 03:49:46 +0200 |
commit | b0bfffcd904503fecec239225f88f7ae4dc14dc6 (patch) | |
tree | f80f6c3813c7b7747221f188df882e70828ab76d /CMakeLists.txt | |
parent | 80b28e7d49d98a990e4d56bba4eb2e4a1bca1a94 (diff) | |
download | MultiMC-b0bfffcd904503fecec239225f88f7ae4dc14dc6.tar MultiMC-b0bfffcd904503fecec239225f88f7ae4dc14dc6.tar.gz MultiMC-b0bfffcd904503fecec239225f88f7ae4dc14dc6.tar.lz MultiMC-b0bfffcd904503fecec239225f88f7ae4dc14dc6.tar.xz MultiMC-b0bfffcd904503fecec239225f88f7ae4dc14dc6.zip |
NOISSUE revert to dumping all build artifacts to the root
This fixes unit tests on Windows... Windows has no mechanism to set library lookup path.
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d6acf79b..e20d375a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,9 +17,13 @@ enable_testing() set(CMAKE_AUTOMOC ON) set(CMAKE_INCLUDE_CURRENT_DIR ON) -######## Set module path ######## set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/") +# Output all executables and shared libs in the main build folder, not in subfolders. +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}) +if(UNIX) + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}) +endif() set(CMAKE_JAVA_TARGET_OUTPUT_DIR ${PROJECT_BINARY_DIR}/jars) ######## Set compiler flags ######## |