File fix-exporting.diff of Package mingw32-quazip

Overview Repositories Revisions Requests Users Attributes Meta

File fix-exporting.diff of Package mingw32-quazip (Revision 69ce50e9515147eb8129c680dd63152d)

Currently displaying revision 69ce50e9515147eb8129c680dd63152d , Show latest

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dd107ba..338828f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,8 @@ set(QT_USE_QTGUI false)
 include(${QT_USE_FILE})
 
 set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)")
-set(LIB_DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STRING "Library directory name" FORCE)
+set(LIB_DESTINATION "lib${LIB_SUFFIX}" CACHE STRING "Library directory name" FORCE)
+set(BIN_DESTINATION "bin" CACHE STRING "Executable directory name" FORCE)
 
 include_directories(${CMAKE_SOURCE_DIR})
 add_subdirectory(quazip)
diff --git a/quazip/CMakeLists.txt b/quazip/CMakeLists.txt
index a4df853..117de8e 100644
--- a/quazip/CMakeLists.txt
+++ b/quazip/CMakeLists.txt
@@ -8,4 +8,4 @@ set_target_properties(quazip PROPERTIES VERSION 1 SOVERSION 1.0.0)
 target_link_libraries(quazip ${QT_QTMAIN_LIBRARY} ${QT_QTCORE_LIBRARY} -lz)
 
 install(FILES ${PUBLIC_HEADERS} DESTINATION include/quazip)
-install(TARGETS quazip LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION})
+install(TARGETS quazip LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${BIN_DESTINATION})
diff --git a/quazip/quazip_global.h b/quazip/quazip_global.h
index d9d09ad..f0c46d4 100644
--- a/quazip/quazip_global.h
+++ b/quazip/quazip_global.h
@@ -39,7 +39,7 @@ quazip/(un)zip.h files for details, basically it's zlib license.
  * When building a DLL with MSVC, QUAZIP_BUILD must be defined.
  * qglobal.h takes care of defining Q_DECL_* correctly for msvc/gcc.
  */
-#if defined(QUAZIP_BUILD)
+#if defined(QUAZIP_BUILD) || defined(quazip_EXPORTS)
 	#define QUAZIP_EXPORT Q_DECL_EXPORT
 #else
 	#define QUAZIP_EXPORT Q_DECL_IMPORT

Places

File fix-exporting.diff of Package mingw32-quazip (Revision 69ce50e9515147eb8129c680dd63152d)

Places