CMake: rm intermediate file, make dependence on GUI 3rd party more

transparent

CMakeLists.txt

@@ -135,7 +135,8 @@ endif()
 add_subdirectory(ThirdParty/common)
 add_subdirectory(ThirdParty/Core)
 if(BORNAGAIN_GUI)
-    add_subdirectory(ThirdParty/GUI)
+    add_subdirectory(ThirdParty/GUI/qt-manhattan-style)
+    add_subdirectory(ThirdParty/GUI/qcustomplot)
 endif()
 
 # from here on our own code, occasionally scrutinized by clang-tidy

GUI/coregui/CMakeLists.txt

@@ -92,10 +92,15 @@ set(${library_name}_LIBRARY ${library_name} PARENT_SCOPE)
 
 
 # --- dependencies ---------
-target_include_directories(${library_name} PUBLIC ${QtAddOn_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR})
-target_include_directories(${library_name} PUBLIC ${include_dirs})
-target_link_libraries(${library_name} ${QtAddOn_LIBRARIES} ${BornAgainCore_LIBRARY} ${ba3d_LIBRARY})
+target_include_directories(${library_name} PUBLIC
+    ${ManhattanStyle_INCLUDE_DIRS}
+    ${qcustomplot_INCLUDE_DIRS}
+    ${CMAKE_SOURCE_DIR})
 target_link_libraries(${library_name}
+    ${ManhattanStyle_LIBRARY}
+    ${qcustomplot_LIBRARY}
+    ${BornAgainCore_LIBRARY}
+    ${ba3d_LIBRARY}
     Qt5::Widgets
     Qt5::Core
     Qt5::Gui

ThirdParty/GUI/CMakeLists.txt

-add_subdirectory(qt-manhattan-style)
-add_subdirectory(qcustomplot)
-
-set(QtAddOn_INCLUDE_DIRS
-    ${ManhattanStyle_INCLUDE_DIRS}
-    ${qcustomplot_INCLUDE_DIRS}
-    PARENT_SCOPE)
-
-set(QtAddOn_LIBRARIES
-    ${ManhattanStyle_LIBRARY}
-    ${qcustomplot_LIBRARY}
-    PARENT_SCOPE)