Switched to autouic

Base @ 18ae9c17

-Subproject commit 57ce0946d2d63c1499b83e4f798c2cfdf431d1e4
+Subproject commit 18ae9c17c57401252a9a91dce678d88f99e9ff89

CMakeLists.txt

@@ -403,7 +403,7 @@ endif()
 acg_append_files (headers "*.hh" ${directories})
 acg_append_files (sources "*.cc" ${directories})
 
-if( QT4_FOUND OR QT5_FOUND )
+if( QT5_FOUND )
 acg_append_files (ui "*.ui" ${directories})
 endif()
 
@@ -426,16 +426,32 @@ of_list_filter  ( sources )
 acg_drop_templates (sources)
 
 if ( QT5_FOUND )
-  # genereate uic and moc targets
-  acg_qt5_autouic (uic_targets ${ui})
 
   # Enable automoc
   set(CMAKE_AUTOMOC ON)
+  set(CMAKE_AUTOUIC ON)
  
   list (APPEND COMISO_LINK_LIBRARIES ${QT_LIBRARIES})
+
+endif()
+
+acg_add_library (CoMISo SHARED ${ui} ${sources} ${headers} ) 
+
+if ( QT5_FOUND )
+
+  if ( NOT WIN32 )
+    # Allow targets depending on ACG find the autogenerated header files
+    target_include_directories( CoMISo PUBLIC
+                               ${CMAKE_CURRENT_BINARY_DIR}/CoMISo_autogen/include )
+  else()
+     # Allow targets depending on ACG find the autogenerated header files
+    target_include_directories( CoMISo PUBLIC
+                               $<$<CONFIG:Debug>:${CMAKE_CURRENT_BINARY_DIR}/CoMISo_autogen/include_Debug/>
+                               $<$<CONFIG:Release>:${CMAKE_CURRENT_BINARY_DIR}/CoMISo_autogen/include_Release/> )
+  endif()
+
 endif()
 
-acg_add_library (CoMISo SHARED ${uic_targets} ${sources} ${headers} )
 
 if (NOT APPLE)
 	target_link_libraries (CoMISo 

QtWidgets/MISolverDialogUI.hh

@@ -42,7 +42,7 @@
 
 //== INCLUDES =================================================================
 
-#include "ui_QtMISolverDialogBaseUI.hh"
+#include "ui_QtMISolverDialogBaseUI.h"
 
 // ACGMake users have to include
 // #include "QtMISolverDialogBase.hh"