Vincent Rabeux avatar Vincent Rabeux committed dbd9497 Merge

Merged.

Comments (0)

Files changed (5)

documentImageCreator/src/framework/CMakeLists.txt

 
 qt4_automoc(${DocumentCreator_sources})
 
-
-
+add_definitions(-DFRAMEWORK_LIB)
 
 ADD_LIBRARY(
         DocumentCreator SHARED

documentImageCreator/src/framework/DocumentCreator/framework_global.h

 
 #include <QtCore/qglobal.h>
 
-#if defined(FRAMEWORK_LIB)
-#  define FRAMEWORK_EXPORT Q_DECL_EXPORT
+#ifdef Q_WS_WIN
+#   ifdef FRAMEWORK_LIB
+#           define FRAMEWORK_EXPORT Q_DECL_EXPORT
+#   else
+#           define FRAMEWORK_EXPORT Q_DECL_IMPORT
+#   endif
 #else
-#  define FRAMEWORK_EXPORT Q_DECL_IMPORT
+#   define FRAMEWORK_EXPORT
 #endif
 
+
 #endif // FRAMEWORK_GLOBAL_H

documentImageCreator/src/framework/DocumentCreator/iomanager/parametricdocumentloader.cpp

     DocImageBlock * ParametricDocumentLoader::buildImageBlock ()
     {
         // do nothing for now
+		return NULL;
     }
 
     DocTextBlock * ParametricDocumentLoader::buildTextBlock ()
     }
 
 
-    DocParagraph * ParametricDocumentLoader::buildParagraph (){}
+    DocParagraph * ParametricDocumentLoader::buildParagraph (){ return NULL;}
     DocParagraph * ParametricDocumentLoader::buildParagraph (QStringList paragraph)
     {
         DocParagraph * p = new DocParagraph(_output);
         return p;
     }
 
-    DocString * ParametricDocumentLoader::buildString (){}
+    DocString * ParametricDocumentLoader::buildString (){return NULL;}
     DocString * ParametricDocumentLoader::buildString (QString str)
     {
         // TODO : default style
         return s;
     }
 
-    DocCharacter * ParametricDocumentLoader::buildCharacter (){}
+    DocCharacter * ParametricDocumentLoader::buildCharacter (){return NULL;}
     DocCharacter * ParametricDocumentLoader::buildCharacter (const QChar ch)
     {
         QAtomicInt id = 1;

libs/Lipsum4Qt/CMakeLists.txt

         GLOB_RECURSE
         Lipsum4Qt_headers
         src/*.h
+)
+
+file(
+        GLOB_RECURSE
+        Lipsum4Qt_moc_headers
         src/*.hpp
 )
 
 
 QT4_ADD_RESOURCES(RCS ${Lipsum4Qt_resources} )
 QT4_WRAP_UI(UI ${Lipsum4Qt_ui})
-QT4_WRAP_CPP(MOC ${Lipsum4Qt_headers})
+QT4_WRAP_CPP(MOC ${Lipsum4Qt_moc_headers})
 
 INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} )
 INCLUDE_DIRECTORIES( ./src )
 
 SET(EXTRA_LIBS  ${QT_LIBRARIES})
 
+add_definitions(-DLIPSUM4QT_LIBRARY)
 
+ADD_LIBRARY(${LIB_NAME} SHARED ${Lipsum4Qt_sources} ${MOC} ${RCS} ${UI} ${Lipsum4Qt_headers})
 
-ADD_LIBRARY(${LIB_NAME} SHARED ${Lipsum4Qt_sources}  ${MOC} ${RCS} ${UI} ${Lipsum4Qt_headers})
 IF( APPLE )
     SET_TARGET_PROPERTIES( ${LIB_NAME}
         PROPERTIES
 TARGET_LINK_LIBRARIES(${LIB_NAME} ${QT_LIBRARIES})
 
 
+######## INSTALLATION
 INSTALL(FILES ${Lipsum4Qt_headers} DESTINATION include/Lipsum4Qt)
 
 
     #    RESOURCE DESTINATION share/foo-${foo_ver}/Resources
 )
 
+if(UNIX)
 INSTALL(FILES Lipsum4Qt.pc DESTINATION lib/pkgconfig)
+endif()
 
 if(UNIX AND NOT APPLE)
     set(CMAKE_INSTALL_PREFIX /usr)

libs/Lipsum4Qt/src/Lipsum4Qt_global.h

 
 #include <QtCore/qglobal.h>
 
-#if defined(LIPSUM4QT_LIBRARY)
-#  define LIPSUM4QTSHARED_EXPORT Q_DECL_EXPORT
-#else
-#  define LIPSUM4QTSHARED_EXPORT Q_DECL_IMPORT
+
+#ifdef Q_WS_WIN
+#   ifdef LIPSUM4QT_LIBRARY
+#           define LIPSUM4QTSHARED_EXPORT Q_DECL_EXPORT
+#   else
+#           define LIPSUM4QTSHARED_EXPORT Q_DECL_IMPORT
+#   endif
+#else
+#   define LIPSUM4QTSHARED_EXPORT
 #endif
 
 #endif // LIPSUM4QT_GLOBAL_H
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.