diff options
| author | Petr Mrázek <peterix@gmail.com> | 2016-03-13 00:44:37 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2016-03-26 17:05:27 +0100 |
| commit | f63d1bc99c93705bdadb8221430bda60c89cc062 (patch) | |
| tree | 55180be144612d8b7bb2ec810f2d238ec0271ab8 /CMakeLists.txt | |
| parent | 02c1df2c3c260fe625b9c3314e9eed2885a97456 (diff) | |
| download | MultiMC-f63d1bc99c93705bdadb8221430bda60c89cc062.tar MultiMC-f63d1bc99c93705bdadb8221430bda60c89cc062.tar.gz MultiMC-f63d1bc99c93705bdadb8221430bda60c89cc062.tar.lz MultiMC-f63d1bc99c93705bdadb8221430bda60c89cc062.tar.xz MultiMC-f63d1bc99c93705bdadb8221430bda60c89cc062.zip | |
NOISSUE revert attempt to use normal binary output locations
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0456a293..9cd3cf47 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,13 +24,13 @@ set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/") set(MMC_SRC "${PROJECT_SOURCE_DIR}") set(MMC_BIN "${PROJECT_BINARY_DIR}") -# # 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() +# 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}/application/jars) +set(CMAKE_JAVA_TARGET_OUTPUT_DIR ${PROJECT_BINARY_DIR}/jars) ######## Set compiler flags ######## set(CMAKE_CXX_STANDARD_REQUIRED true) |