philipp/qhttpengine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix link type mismatch on Windows and build a shared library by default.

Browse Source
This commit is contained in:
Nathan Osman
2018-03-22 13:14:00 -07:00
parent f70405e4d6
commit 43f55df516
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@@ -11,6 +11,9 @@ set(PROJECT_VERSION_MINOR 0)
set(PROJECT_VERSION_PATCH 1) set(PROJECT_VERSION_PATCH 1)
set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}) set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
# Build a shared library by default
option(BUILD_SHARED_LIBS "Build QHttpEngine as a shared library" ON)
set(BIN_INSTALL_DIR bin CACHE STRING "Binary runtime installation directory relative to the install prefix") set(BIN_INSTALL_DIR bin CACHE STRING "Binary runtime installation directory relative to the install prefix")
set(LIB_INSTALL_DIR lib CACHE STRING "Library installation directory relative to the install prefix") set(LIB_INSTALL_DIR lib CACHE STRING "Library installation directory relative to the install prefix")
set(INCLUDE_INSTALL_DIR include CACHE STRING "Header installation directory relative to the install prefix") set(INCLUDE_INSTALL_DIR include CACHE STRING "Header installation directory relative to the install prefix")

8
src/qhttpengine_export.h.in
View File

@@ -30,14 +30,16 @@
#define QHTTPENGINE_VERSION_PATCH @PROJECT_VERSION_PATCH@ #define QHTTPENGINE_VERSION_PATCH @PROJECT_VERSION_PATCH@
#define QHTTPENGINE_VERSION "@PROJECT_VERSION@" #define QHTTPENGINE_VERSION "@PROJECT_VERSION@"
#if defined(QT_STATIC) #cmakedefine BUILD_SHARED_LIBS
# define QHTTPENGINE_EXPORT
#else #if defined(BUILD_SHARED_LIBS)
# if defined(QHTTPENGINE_LIBRARY) # if defined(QHTTPENGINE_LIBRARY)
# define QHTTPENGINE_EXPORT Q_DECL_EXPORT # define QHTTPENGINE_EXPORT Q_DECL_EXPORT
# else # else
# define QHTTPENGINE_EXPORT Q_DECL_IMPORT # define QHTTPENGINE_EXPORT Q_DECL_IMPORT
# endif # endif
#else
# define QHTTPENGINE_EXPORT
#endif #endif
#endif // QHTTPENGINE_QHTTPENGINE_H #endif // QHTTPENGINE_QHTTPENGINE_H