diff --git a/CMakeLists.txt b/CMakeLists.txt
index 124eeab..fca1509 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,6 +3,8 @@ set(PROJECT_NAME  GUI)
 project(${PROJECT_NAME})
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+
 #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O2 -pthread")
 
 # GUI Version
@@ -22,7 +24,7 @@ file(GLOB_RECURSE  project_cxx ./src/*.cxx)
 file(GLOB_RECURSE  project_cc ./src/*.cc)
 
 if(NOT UNIX)
-        set(USE_SHIMLIB OFF)
+    set(USE_SHIMLIB OFF)
 endif()
 if(UNIX AND USE_SHIMLIB)
         file(GLOB_RECURSE  project_c ./src/json/*.c)
@@ -37,19 +39,23 @@ source_group(TREE ${CMAKE_SOURCE_DIR} FILES ${project_cxx})
 source_group(TREE ${CMAKE_SOURCE_DIR} FILES ${project_cc})
 source_group(TREE ${CMAKE_SOURCE_DIR} FILES ${project_c})
 
-find_package(Qt5 COMPONENTS Core Widgets Gui OpenGL Sql Network Multimedia MultimediaWidgets REQUIRED)
-find_package(DCMTK REQUIRED)
-
-set(Req_DIR "${CMAKE_CURRENT_SOURCE_DIR}/thirdParty/Req/pub/cmake")
-find_package(Req REQUIRED)
-message(${Req_INCLUDES_DIRS})
-include_directories(${DCMTK_INCLUDE_DIRS})
+set(Build_With_System_QT OFF)
 if(Build_With_System_QT)
 include_directories(/usr/include/qt5/ 
                     /usr/include/qt5/QtCore /usr/include/qt5/QtWidgets /usr/include/qt5/QtGui  
                     /usr/include/qt5/QtSql  /usr/include/qt5/QtMultimedia /usr/include/qt5/QtMultimediaWidgets )
 endif()
 
+find_package(Qt5 COMPONENTS Core Widgets Gui Sql Network Multimedia MultimediaWidgets REQUIRED)
+find_package(DCMTK REQUIRED)
+
+set(Req_DIR "${CMAKE_CURRENT_SOURCE_DIR}/thirdParty/Req/pub/cmake")
+find_package(Req REQUIRED)
+message(${Req_INCLUDES_DIRS})
+
+include_directories(${DCMTK_INCLUDE_DIRS})
+
+
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 file(GLOB_RECURSE  project_uis ./src/*.ui)
@@ -100,9 +106,9 @@ if(UNIX )
     if(Build_With_System_QT)
         link_directories( "/usr/lib64")
         target_link_libraries(${PROJECT_NAME} Qt5Core.so Qt5Widgets.so Qt5Gui.so  Qt5Sql.so  Qt5Network.so Qt5Multimedia.so Qt5MultimediaWidgets.so pthread)
-    elseif()
+    else()
     target_link_libraries(${PROJECT_NAME} Qt5::Core Qt5::Widgets Qt5::Gui Qt5::OpenGL Qt5::Sql  Qt5::Network Qt5::Multimedia Qt5::MultimediaWidgets pthread)
-    endif()
+    endif(Build_With_System_QT)
 else()
         target_link_libraries(${PROJECT_NAME} Qt5::Core Qt5::Widgets Qt5::Gui Qt5::OpenGL Qt5::Sql  Qt5::Network Qt5::Multimedia Qt5::MultimediaWidgets)
 endif()