diff --git a/CMakeLists.txt b/CMakeLists.txt
index 73cbdd0c..25a53fb5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -215,13 +215,13 @@ set(SRC_FILES
 #
 # matrix-structs
 #
-include(${CMAKE_SOURCE_DIR}/cmake/MatrixStructs.cmake)
+include(MatrixStructs)
 include_directories(${MATRIX_STRUCTS_INCLUDE_DIRS})
 
 #
 # lmdbxx
 #
-include(${CMAKE_SOURCE_DIR}/cmake/LMDBXX.cmake)
+include(LMDBXX)
 include_directories(${LMDBXX_INCLUDE_DIRS})
 
 include_directories(include)
@@ -321,7 +321,7 @@ endif()
 qt5_add_resources(LANG_QRC ${_qrc})
 qt5_add_resources(QRC resources/res.qrc)
 
-set(COMMON_LIBS ${MATRIX_STRUCTS_LIBRARY} Qt5::Widgets Qt5::Network Qt5::Concurrent)
+set(COMMON_LIBS matrix_structs Qt5::Widgets Qt5::Network Qt5::Concurrent)
 
 if(APPVEYOR_BUILD)
     set(NHEKO_LIBS ${COMMON_LIBS} lmdb)
diff --git a/cmake/MatrixStructs.cmake b/cmake/MatrixStructs.cmake
index 73608981..42071b61 100644
--- a/cmake/MatrixStructs.cmake
+++ b/cmake/MatrixStructs.cmake
@@ -8,13 +8,17 @@ set(THIRD_PARTY_ROOT ${CMAKE_SOURCE_DIR}/.third-party)
 set(MATRIX_STRUCTS_ROOT ${THIRD_PARTY_ROOT}/matrix_structs)
 
 set(MATRIX_STRUCTS_INCLUDE_DIRS ${MATRIX_STRUCTS_ROOT}/deps)
-set(MATRIX_STRUCTS_LIBRARY
-    ${MATRIX_STRUCTS_ROOT}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}matrix_structs${CMAKE_STATIC_LIBRARY_SUFFIX})
 
 include_directories(SYSTEM ${MATRIX_STRUCTS_ROOT}/deps)
 include_directories(SYSTEM ${MATRIX_STRUCTS_ROOT}/include)
 link_directories(${MATRIX_STRUCTS_ROOT}/lib)
 
+set(WINDOWS_FLAGS "")
+
+if(MSVC)
+    set(WINDOWS_FLAGS "-DCMAKE_GENERATOR_PLATFORM=x64")
+endif()
+
 ExternalProject_Add(
   MatrixStructs
 
@@ -26,7 +30,7 @@ ExternalProject_Add(
   CONFIGURE_COMMAND ${CMAKE_COMMAND}
     -DCMAKE_BUILD_TYPE=Release ${MATRIX_STRUCTS_ROOT}
     -DCMAKE_INSTALL_PREFIX=${MATRIX_STRUCTS_ROOT}
-    -Ax64
+    ${WINDOWS_FLAGS}
   BUILD_COMMAND ${CMAKE_COMMAND} --build ${MATRIX_STRUCTS_ROOT} --config Release
   INSTALL_COMMAND ${CMAKE_COMMAND}
     --build ${MATRIX_STRUCTS_ROOT}