Browse Source

modified for Qt5 MinGW32 for Windows

maoting 6 years ago
parent
commit
e95f76dc47

+ 3 - 2
CMakeLists.txt

@@ -418,6 +418,7 @@ endif()
 #-----------------------------------------------------------------------------
 # QT
 #
+set(CTK_QT_VERSION "5")
 ctkMacroSetupQt()
 
 # Update CTK_BASE_LIBRARIES with QT libraries
@@ -479,11 +480,11 @@ ctk_lib_option(Core
                "Build the Core library" ON)
 
 ctk_lib_option(PluginFramework
-               "Build the Plugin Framework" OFF
+               "Build the Plugin Framework" ON
                CTK_ENABLE_PluginFramework)
 
 ctk_lib_option(Widgets
-               "Build the Widgets library" OFF
+               "Build the Widgets library" ON
                CTK_ENABLE_Widgets OR (CTK_ENABLE_DICOMApplicationHosting AND CTK_BUILD_EXAMPLES) OR CTK_USE_QTTESTING)
 
 ctk_lib_option(DICOM/Core

+ 2 - 2
Libs/PluginFramework/service/application/ctkApplicationDescriptor.cpp

@@ -25,9 +25,9 @@
 
 const QString ctkApplicationDescriptor::APPLICATION_NAME = "application.name";
 const QString ctkApplicationDescriptor::APPLICATION_ICON = "application.icon";
-const QString ctkApplicationDescriptor::APPLICATION_PID = ctkPluginConstants::SERVICE_PID;
+const QString ctkApplicationDescriptor::APPLICATION_PID = "service.pid";    //ctkPluginConstants::SERVICE_PID;
 const QString ctkApplicationDescriptor::APPLICATION_VERSION = "application.version";
-const QString ctkApplicationDescriptor::APPLICATION_VENDOR = ctkPluginConstants::SERVICE_VENDOR;
+const QString ctkApplicationDescriptor::APPLICATION_VENDOR = "service.vendor";    //ctkPluginConstants::SERVICE_VENDOR;
 const QString ctkApplicationDescriptor::APPLICATION_VISIBLE = "application.visible";
 const QString ctkApplicationDescriptor::APPLICATION_LAUNCHABLE = "application.launchable";
 const QString ctkApplicationDescriptor::APPLICATION_LOCKED = "application.locked";

+ 1 - 1
Libs/PluginFramework/service/application/ctkApplicationHandle.cpp

@@ -23,7 +23,7 @@
 
 #include <ctkPluginConstants.h>
 
-const QString ctkApplicationHandle::APPLICATION_PID = ctkPluginConstants::SERVICE_PID;
+const QString ctkApplicationHandle::APPLICATION_PID = "service.pid";//ctkPluginConstants::SERVICE_PID;
 const QString ctkApplicationHandle::APPLICATION_DESCRIPTOR = "application.descriptor";
 const QString ctkApplicationHandle::APPLICATION_STATE = "application.state";
 const QString ctkApplicationHandle::APPLICATION_SUPPORTS_EXITVALUE = "application.supports.exitvalue";

+ 14 - 2
SuperBuild.cmake

@@ -39,6 +39,18 @@ if(CMAKE_CXX_STANDARD)
   set(ep_cxx_standard_arg "-DCMAKE_CXX_STANDARD:STRING=${CMAKE_CXX_STANDARD}")
 endif()
 
+# Add install command
+if(WIN32)
+    set(_INSTALL_CMD mingw32-make install)
+else()
+    set(_INSTALL_CMD make install)
+endif()
+# Set install location
+if(CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
+    set(_INSTALL_DIR ${CTK_BINARY_DIR}/../CTKInstallR)
+else()
+    set(_INSTALL_DIR ${CTK_BINARY_DIR}/../CTKInstallD)
+endif()
 ExternalProject_Add(${proj}
   ${${proj}_EP_ARGS}
   DOWNLOAD_COMMAND ""
@@ -49,12 +61,12 @@ ExternalProject_Add(${proj}
     -DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
     -DCMAKE_CXX_FLAGS_INIT:STRING=${CMAKE_CXX_FLAGS_INIT}
     -DCMAKE_C_FLAGS_INIT:STRING=${CMAKE_C_FLAGS_INIT}
-    -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
+    -DCMAKE_INSTALL_PREFIX:PATH=${_INSTALL_DIR}
     -DCMAKE_MACOSX_RPATH:BOOL=${CMAKE_MACOSX_RPATH}
     ${ep_cxx_standard_arg}
   SOURCE_DIR ${CTK_SOURCE_DIR}
   BINARY_DIR ${CTK_BINARY_DIR}/CTK-build
-  INSTALL_COMMAND ""
+  INSTALL_COMMAND ${_INSTALL_CMD}
   DEPENDS
     ${CTK_DEPENDENCIES}
   )