diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7b3dd3c0958efbf4725c755d653d5ca43ccbe5e3..b0cc2762265ff70095a1f7ebf0c2b6724f960394 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -58,9 +58,19 @@ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake_modules)
 
 if (Pwiz_FOUND)
 else (Pwiz_FOUND)
-    FIND_PACKAGE(Pwiz REQUIRED)
+    FIND_PACKAGE(Pwiz REQUIRED COMPONENTS chrono filesystem iostreams program_options serialization system thread)
 endif (Pwiz_FOUND)
 
+if (Boost_FOUND)
+else (Boost_FOUND)
+    FIND_PACKAGE(Boost REQUIRED)
+endif (Boost_FOUND)
+
+
+
+if (Boost_FOUND)
+    MESSAGE("Boost_LIBRARIES found ${Boost_LIBRARIES}")
+endif (Boost_FOUND)
 
 
 IF (Pwiz_FOUND)
@@ -231,7 +241,7 @@ target_compile_definitions(xtpcpp PUBLIC ${QT_DEFINITIONS})
     #COMPILE_DEFINITIONS "${QT_DEFINITIONS}"
     #INCLUDE_DIRECTORIES "${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR}"
     )
-TARGET_LINK_LIBRARIES(xtpcpp ${PAPPSOMSPP_QT5_LIBRARY} ${PAPPSOMSPP_WIDGET_QT5_LIBRARY} ${Pwiz_LIBRARY} ${ODSSTREAM_QT5_LIBRARY} ${QCustomPlot_LIBRARIES}
+TARGET_LINK_LIBRARIES(xtpcpp ${PAPPSOMSPP_QT5_LIBRARY} ${PAPPSOMSPP_WIDGET_QT5_LIBRARY} ${Pwiz_LIBRARY} ${ODSSTREAM_QT5_LIBRARY} ${QCustomPlot_LIBRARIES} ${Boost_LIBRARIES}
 Qt5::Gui Qt5::Xml Qt5::Svg Qt5::PrintSupport)
 
 INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/xtpcpp DESTINATION bin)
diff --git a/win64/Toolchain-mingw64.cmake b/win64/Toolchain-mingw64.cmake
index 72ccb1daec6289c8d942bfde0b38e1815da68e6c..17bfed97ecc05538c2f6b8433fa6cf30084562cf 100644
--- a/win64/Toolchain-mingw64.cmake
+++ b/win64/Toolchain-mingw64.cmake
@@ -39,4 +39,15 @@ set(PAPPSOMSPP_WIDGET_QT5_LIBRARY "/home/polipo/devel/pappsomspp/build/libpappso
 set(Pwiz_FOUND 1)
 set(Pwiz_INCLUDE_DIR "/home/polipo/devel/proteowizard/pwiz-autotools/pwiz/includes/libpwiz")
 set(Pwiz_LIBRARY "/home/polipo/devel/proteowizard/libpwiz.dll")
+
+
+set(Boost_FOUND 1)
 set(Boost_INCLUDE_DIRS "/home/polipo/devel/boost/boost_1_56_0")
+set(Boost_LIBRARY_DIRS "/home/polipo/devel/boost/boost_1_56_0/first-build-mingw64/lib")
+set(Boost_LIBRARIES "/home/polipo/devel/boost/boost_1_56_0/first-build-mingw64/lib/libboost_chrono.dll 
+/home/polipo/devel/boost/boost_1_56_0/first-build-mingw64/lib/libboost_filesystem.dll 
+/home/polipo/devel/boost/boost_1_56_0/first-build-mingw64/lib/libboost_iostreams.dll 
+/home/polipo/devel/boost/boost_1_56_0/first-build-mingw64/lib/libboost_program_options.dll 
+/home/polipo/devel/boost/boost_1_56_0/first-build-mingw64/lib/libboost_serialization.dll 
+/home/polipo/devel/boost/boost_1_56_0/first-build-mingw64/lib/libboost_system.dll 
+/home/polipo/devel/boost/boost_1_56_0/first-build-mingw64/lib/libboost_thread.dll")