update qm_init_directories

Author: SineStriker

cmake/modules/Filesystem.cmake

@@ -14,10 +14,21 @@ macro(qm_init_directories)
         set(QMSETUP_BUILD_DIR "${CMAKE_BINARY_DIR}/out-$<LOWER_CASE:${CMAKE_SYSTEM_PROCESSOR}>-$<CONFIG>")
     endif()
 
-    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${QMSETUP_BUILD_DIR}/bin)
-    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${QMSETUP_BUILD_DIR}/lib)
-    set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${QMSETUP_BUILD_DIR}/lib)
-    set(CMAKE_BUILD_SHARE_DIR ${QMSETUP_BUILD_DIR}/share)
+    if(NOT DEFINED CMAKE_RUNTIME_OUTPUT_DIRECTORY)
+        set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${QMSETUP_BUILD_DIR}/bin)
+    endif()
+
+    if(NOT DEFINED CMAKE_LIBRARY_OUTPUT_DIRECTORY)
+        set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${QMSETUP_BUILD_DIR}/lib)
+    endif()
+
+    if(NOT DEFINED CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
+        set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${QMSETUP_BUILD_DIR}/lib)
+    endif()
+
+    if(NOT DEFINED CMAKE_BUILD_SHARE_DIR)
+        set(CMAKE_BUILD_SHARE_DIR ${QMSETUP_BUILD_DIR}/share)
+    endif()
 endmacro()
 
 #[[

src/CMakeLists.txt

@@ -6,7 +6,7 @@ if(QMSETUP_STATIC_RUNTIME)
     if(MINGW)
         add_link_options(-static -static-libgcc -static-libstdc++)
     elseif(MSVC)
-        add_compile_options("$<$<CONFIG:Release>:/MT>" "$<$<CONFIG:Debug>:/MTd>")
+        add_compile_options(/MT)
     endif()
 endif()