diff --git a/CMakeLists.txt b/CMakeLists.txt
index fba7d43d9a7097dc76469a20a830e20d75984929..3b3dfd4b04eb658154fbbf4dab03714889cc6dd6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,8 +39,6 @@ endif()
 #--------------------------------#
 set(CMAKE_CXX_STANDARD 17)
 
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" )
-
 if( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel" )
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -xHost" )
 elseif( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC" ) 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c4ef238237f5f9f2ac942ff6b6698b392f167660..b3a69cfdf4b7bd030957c725422f3fb1859f1283 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -52,13 +52,19 @@ if ("${BUILD_LIB}" STREQUAL "yes")
 		NormalizationStrategy/NormalizationStrategy.cpp
 	)
 
+    # FileSystem C++ library - has to be linked manually in GCC-8
+	set(CXX_FILESYSTEM_LIB "")
+	if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+		set(CXX_FILESYSTEM_LIB "stdc++fs")
+	endif()
+
     target_link_libraries(
         lib4neuro
 
         PRIVATE
             exprtk_wrap
             ${Boost_LIBRARIES}
-			stdc++fs
+			${CXX_FILESYSTEM_LIB}
     )
 
 	target_include_directories(