Changes to muon interface cmake. Re #20288

qt/scientific_interfaces/EnggDiffraction/CMakeLists.txt

@@ -47,7 +47,6 @@ mtd_add_qt_library (TARGET_NAME MantidScientificInterfacesEnggDiffraction
                     PERECOMPILED PrecompiledHeader.h
                     LINK_LIBRARIES
                         ${TCMALLOC_LIBRARIES_LINKTIME}
-                        MantidScientificInterfacesMuon
                         ${CORE_MANTIDLIBS}
                         ${QT_LIBRARIES}
                         ${QWT_LIBRARIES}
@@ -56,6 +55,7 @@ mtd_add_qt_library (TARGET_NAME MantidScientificInterfacesEnggDiffraction
                         ${JSONCPP_LIBRARIES}
                     MTD_QT_LINK_LIBRARIES
                         MantidQtWidgetsCommon
+                        MantidScientificInterfacesMuon
                     INSTALL_DIR ${PLUGINS_DIR}/qtplugins/mantid
                     OSX_INSTALL_RPATH "@loader_path/../../../Contents/MacOS"
 )

qt/scientific_interfaces/ISISSANS/CMakeLists.txt

@@ -47,7 +47,6 @@ mtd_add_qt_library (TARGET_NAME MantidScientificInterfacesISISSANS
                     PERECOMPILED PrecompiledHeader.h
                     LINK_LIBRARIES
                         ${TCMALLOC_LIBRARIES_LINKTIME}
-                        MantidScientificInterfacesMuon
                         ${CORE_MANTIDLIBS}
                         ${QT_LIBRARIES}
                         ${QWT_LIBRARIES}
@@ -56,6 +55,7 @@ mtd_add_qt_library (TARGET_NAME MantidScientificInterfacesISISSANS
                         ${JSONCPP_LIBRARIES}
                     MTD_QT_LINK_LIBRARIES
                         MantidQtWidgetsCommon
+                        MantidScientificInterfacesMuon
                     INSTALL_DIR ${PLUGINS_DIR}/qtplugins/mantid
                     OSX_INSTALL_RPATH "@loader_path/../../../Contents/MacOS"
 )

qt/scientific_interfaces/Muon/CMakeLists.txt

@@ -84,48 +84,31 @@ set ( UI_FILES
     MuonSequentialFitDialog.ui
 )
 
-qt4_wrap_cpp ( MOCCED_FILES ${MOC_FILES} OPTIONS ${extra_options} )
+include_directories(..)
 
-set ( ALL_SRC ${SRC_FILES} ${MOCCED_FILES} )
-
-qt4_wrap_ui ( UI_HDRS ${UI_FILES} )
-include_directories (
-  ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_CURRENT_BINARY_DIR}/../MultiDatasetFit
-  ${CMAKE_CURRENT_LIST_DIR}/../MultiDatasetFit
+mtd_add_qt_library (TARGET_NAME MantidScientificInterfacesMuon
+                    SRC ${SRC_FILES}
+                    MOC ${MOC_FILES}
+                    NOMOC ${INC_FILES}
+                    UI ${UI_FILES}
+                    DEFS IN_MANTIDQT_MUONINTERFACE
+                    PERECOMPILED PrecompiledHeader.h
+                    LINK_LIBRARIES
+                        ${TCMALLOC_LIBRARIES_LINKTIME}
+                        ${CORE_MANTIDLIBS}
+                        ${QT_LIBRARIES}
+                        ${QWT_LIBRARIES}
+                        ${POCO_LIBRARIES}
+                        ${Boost_LIBRARIES}
+                        ${JSONCPP_LIBRARIES}
+                    MTD_QT_LINK_LIBRARIES
+                        MantidQtWidgetsCommon
+                        MantidScientificInterfacesMultiDatasetFit
+                    INSTALL_DIR ${PLUGINS_DIR}/qtplugins/mantid
+                    OSX_INSTALL_RPATH "@loader_path/../../../Contents/MacOS"
 )
 
-
-# Use a precompiled header where they are supported
-enable_precompiled_headers( PrecompiledHeader.h  ALL_SRC )
-add_library ( MantidScientificInterfacesMuon ${ALL_SRC} ${INC_FILES} ${UI_HDRS} )
-
-# Set the name of the generated library
-set_target_properties ( MantidScientificInterfacesMuon PROPERTIES COMPILE_DEFINITIONS IN_MANTIDQT_MUONINTERFACE )
 if ( MSVC_IDE )
 #  # Add to the 'ScientificInterfaces' group in VS
-  set_property ( TARGET MantidScientificInterfacesMuon PROPERTY FOLDER "ScientificInterfaces" )
+  set_property ( TARGET MantidScientificInterfacesMuonQt4 PROPERTY FOLDER "ScientificInterfaces" )
 endif()
-
-if (OSX_VERSION VERSION_GREATER 10.8)
-  set_target_properties ( MantidScientificInterfacesMuon PROPERTIES INSTALL_RPATH "@loader_path/../../../Contents/MacOS")
-endif ()
-
-find_Package(Threads)
-
-target_link_libraries ( MantidScientificInterfacesMuon LINK_PRIVATE ${TCMALLOC_LIBRARIES_LINKTIME}
-            MantidQtWidgetsCommonQt4
-            MantidScientificInterfacesMultiDatasetFitQt4
-            ${CORE_MANTIDLIBS}
-            ${QT_LIBRARIES}
-            ${QWT_LIBRARIES}
-            ${POCO_LIBRARIES}
-            ${Boost_LIBRARIES}
-            ${JSONCPP_LIBRARIES}
-            ${CMAKE_THREAD_LIBS_INIT})
-
-###########################################################################
-# Installation settings
-###########################################################################
-
-install ( TARGETS MantidScientificInterfacesMuon ${SYSTEM_PACKAGE_TARGET} DESTINATION ${PLUGINS_DIR}/qtplugins/mantid )

qt/scientific_interfaces/Muon/MuonAnalysisFitFunctionPresenter.cpp

 #include "MuonAnalysisFitFunctionPresenter.h"
 #include "MantidAPI/IFunction.h"
-
-#include "MDFEditLocalParameterDialog.h"
+#include "MultiDatasetFit/MDFEditLocalParameterDialog.h"
 
 using MantidQt::CustomInterfaces::MDF::EditLocalParameterDialog;
 

qt/scientific_interfaces/test/CMakeLists.txt

@@ -46,7 +46,7 @@ if ( CXXTEST_FOUND )
   cxxtest_add_test ( ScientificInterfacesTest ${TEST_FILES} ${GMOCK_TEST_FILES} )
   target_link_libraries( ScientificInterfacesTest LINK_PRIVATE ${TCMALLOC_LIBRARIES_LINKTIME}
             MantidScientificInterfacesGeneralQt4
-            MantidScientificInterfacesMuon
+            MantidScientificInterfacesMuonQt4
             MantidScientificInterfacesISISReflectometryQt4
             MantidScientificInterfacesEnggDiffractionQt4
             MantidScientificInterfacesMultiDatasetFitQt4