diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2016-03-30 17:47:19 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2016-03-30 17:47:19 -0700 |
| commit | 4848d6f15206dd4a92205fdf6b34885c7463d512 (patch) | |
| tree | ee12c9fe89f83174c73da15edb5061032efc66dd | |
| parent | 9b79d4ccac0c47e58ce3cfe033730106b6fd302f (diff) | |
| parent | 9dbec27cb6b65312360dab5175f1ac5574a36dfd (diff) | |
| download | binaryen-4848d6f15206dd4a92205fdf6b34885c7463d512.tar.gz binaryen-4848d6f15206dd4a92205fdf6b34885c7463d512.tar.bz2 binaryen-4848d6f15206dd4a92205fdf6b34885c7463d512.zip | |
Merge pull request #296 from juj/no_cmake_multigenerator_subdirectories
no_cmake_multigenerator_subdirectories
| -rw-r--r-- | CMakeLists.txt | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 89f7ce54c..d434e221d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,9 +24,12 @@ ENDFUNCTION() INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src) -SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin") -SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib") -SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib") +# Force output to bin/ and lib/. This is to suppress CMake multigenerator output paths and avoid bin/Debug, bin/Release/ and so on, which is CMake default. +FOREACH(SUFFIX "_DEBUG" "_RELEASE" "_RELWITHDEBINFO" "_MINSIZEREL" "") + SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY${SUFFIX} "${PROJECT_BINARY_DIR}/bin") + SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY${SUFFIX} "${PROJECT_BINARY_DIR}/lib") + SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY${SUFFIX} "${PROJECT_BINARY_DIR}/lib") +ENDFOREACH() IF(MSVC) IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "19.0") # VS2013 and older explicitly need /arch:sse2 set, VS2015 no longer has that option, but always enabled. |