瀏覽代碼

Merge branch 'library-type-for-qtdesigner-build-macro'

* library-type-for-qtdesigner-build-macro:
  QtDesigner library type is set to MODULE
Jean-Christophe Fillion-Robin 13 年之前
父節點
當前提交
5c6d3019fa
共有 1 個文件被更改,包括 2 次插入4 次删除
  1. 2 4
      CMake/ctkMacroBuildQtDesignerPlugin.cmake

+ 2 - 4
CMake/ctkMacroBuildQtDesignerPlugin.cmake

@@ -26,7 +26,7 @@
 #! \ingroup CMakeAPI
 MACRO(ctkMacroBuildQtDesignerPlugin)
   CtkMacroParseArguments(MY
-    "NAME;EXPORT_DIRECTIVE;SRCS;MOC_SRCS;UI_FORMS;INCLUDE_DIRECTORIES;TARGET_LIBRARIES;RESOURCES;LIBRARY_TYPE"
+    "NAME;EXPORT_DIRECTIVE;SRCS;MOC_SRCS;UI_FORMS;INCLUDE_DIRECTORIES;TARGET_LIBRARIES;RESOURCES"
     ""
     ${ARGN}
     )
@@ -38,9 +38,7 @@ MACRO(ctkMacroBuildQtDesignerPlugin)
   IF(NOT DEFINED MY_EXPORT_DIRECTIVE)
     MESSAGE(FATAL_ERROR "EXPORT_DIRECTIVE is mandatory")
   ENDIF()
-  IF(NOT DEFINED MY_LIBRARY_TYPE)
-    SET(MY_LIBRARY_TYPE "SHARED")
-  ENDIF()
+  SET(MY_LIBRARY_TYPE "MODULE")
 
   # Define library name
   SET(lib_name ${MY_NAME})