cmake: added first version for musrStep and musrWiz.

src/musredit_qt5/CMakeLists.txt

@@ -1,7 +1,5 @@
 #--- musredit_qt5 for Qt > 5.0 ------------------------------------------------
 
-message("debug> will eventually deal with Qt > 5.0 musredit, musrStep, musrWiz, ...")
-
 #--- create musrfit-info.h ----------------------------------------------------
 configure_file(
   ${CMAKE_SOURCE_DIR}/cmake/musrfit-info.h.in
@@ -9,5 +7,5 @@ configure_file(
 )
 
 add_subdirectory(musredit)
-#add_subdirectory(musrStep)
-#add_subdirectory(musrWiz)
+add_subdirectory(musrStep)
+add_subdirectory(musrWiz)

src/musredit_qt5/musrStep/CMakeLists.txt

@@ -0,0 +1,47 @@
+#--- musrStep for Qt > 5.0 ----------------------------------------------------
+
+set(qt_libs Qt5::Core Qt5::Widgets Qt5::Svg)
+
+set(musrStep_src
+  PMusrStep.cpp
+  musrStep.cpp
+)
+
+# Instruct CMake to run moc automatically when needed
+set(CMAKE_AUTOMOC ON)
+
+#[==[ 
+# as35 currently CMAKE_AUTOUIC -> ON doesn't work since it requires the ui-files
+#      in the same directory as the cpp-files.
+# Create code from a list of Qt designer ui files
+set(CMAKE_AUTOUIC ON)
+#]==]
+set(CMAKE_AUTOUIC OFF)
+
+# add qt/rcc
+qt5_add_resources(musrStep_rcc musrStep.qrc)
+
+add_executable(musrStep 
+  ${musrStep_src}
+  ${musrStep_rcc}
+)
+
+target_include_directories(musrStep
+  BEFORE PRIVATE
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/..>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/../..>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../include>
+)
+
+target_link_libraries(musrStep ${qt_libs})
+
+#--- installation info --------------------------------------------------------
+install(
+  TARGETS
+    musrStep
+  RUNTIME DESTINATION
+    bin
+)
+

src/musredit_qt5/musrWiz/CMakeLists.txt

@@ -0,0 +1,51 @@
+#--- musrWiz for Qt > 5.0 -----------------------------------------------------
+
+set(qt_libs Qt5::Core Qt5::Widgets Qt5::Svg Qt5::Xml)
+
+set(musrWiz_src
+  PTheoTemplate.cpp
+  PMusrfitFunc.cpp
+  PInstrumentDef.cpp
+  PAdmin.cpp
+  PMusrWiz.cpp
+  musrWiz.cpp
+)
+
+# Instruct CMake to run moc automatically when needed
+set(CMAKE_AUTOMOC ON)
+
+#[==[ 
+# as35 currently CMAKE_AUTOUIC -> ON doesn't work since it requires the ui-files
+#      in the same directory as the cpp-files.
+# Create code from a list of Qt designer ui files
+set(CMAKE_AUTOUIC ON)
+#]==]
+set(CMAKE_AUTOUIC OFF)
+
+# add qt/rcc
+qt5_add_resources(musrWiz_rcc musrWiz.qrc)
+
+add_executable(musrWiz 
+  ${musrWiz_src}
+  ${musrWiz_rcc}
+)
+
+target_include_directories(musrWiz
+  BEFORE PRIVATE
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/..>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/../..>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../include>
+)
+
+target_link_libraries(musrWiz ${qt_libs})
+
+#--- installation info --------------------------------------------------------
+install(
+  TARGETS
+    musrWiz
+  RUNTIME DESTINATION
+    bin
+)
+

src/musredit_qt5/musredit/CMakeLists.txt

@@ -1,7 +1,5 @@
 #--- musredit for Qt > 5.0 ----------------------------------------------------
 
-message("debug> will deal with the build of musredit (Qt 5)")
-
 #--- check if Qt5WebEngine or Qt5WebKit is present ----------------------------
 find_package(Qt5WebEngine QUIET)
 find_package(Qt5WebKit QUIET)