Merge branch 'release/2.x' into dev

Author: halx99

3rdparty/CMakeLists.txt

@@ -115,11 +115,20 @@ function(ax_add_3rd source_dir)
 
     if (NOT is_imported_lib)
       if(tgt_type STREQUAL "SHARED_LIBRARY")
-        set_target_properties(${tgt} PROPERTIES
-          ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
-          RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"        
-          FOLDER "3rdparty"
-        )
+        if(LINUX)
+          set_target_properties(${tgt} PROPERTIES
+            ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
+            LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
+            RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"        
+            FOLDER "3rdparty"
+          )
+        else()      
+          set_target_properties(${tgt} PROPERTIES
+            ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
+            RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"         
+            FOLDER "3rdparty"
+          )
+        endif()
       elseif(NOT(tgt_type STREQUAL "INTERFACE_LIBRARY"))
         set_target_properties(${tgt} PROPERTIES
           ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"