This file is part of MXE. See LICENSE.md for licensing information. Contains ad hoc patches for cross building. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sat, 18 Nov 2017 21:41:08 +1100 Subject: [PATCH 1/2] fixes diff --git a/CMakeLists.txt b/CMakeLists.txt index 1111111..2222222 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,13 +56,13 @@ set(QJSON_LIB_VERSION_STRING "${QJSON_LIB_MAJOR_VERSION}.${QJSON_LIB_MINOR_VERSI set(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib" ) # pkg-config -IF (NOT WIN32) +#IF (NOT WIN32) CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/QJson.pc.in ${CMAKE_CURRENT_BINARY_DIR}/QJson.pc @ONLY) INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/QJson.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) -ENDIF (NOT WIN32) +#ENDIF (NOT WIN32) # Subdirs ADD_SUBDIRECTORY(src) From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sat, 18 Nov 2017 21:42:43 +1100 Subject: [PATCH 2/2] build as static lib taken from: http://sourceforge.net/mailarchive/forum.php?thread_name=4E1DBC0D.10000%40jrit.at&forum_name=qjson-devel diff --git a/CMakeLists.txt b/CMakeLists.txt index 1111111..2222222 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,6 +31,13 @@ SET(FRAMEWORK_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/Library/Frameworks" # (This will have no effect with CMake < 2.8) SET(QT_USE_IMPORTED_TARGETS TRUE) +# For Static builds +IF(LIBTYPE STREQUAL "STATIC") + ADD_DEFINITIONS("-DQJSON_STATIC") + ADD_DEFINITIONS("-DQT_NODLL") + SET(PKG_CONFIG_CFLAGS -DQJSON_STATIC ${PKG_CONFIG_CFLAGS}) +endif() + # Find Qt4 FIND_PACKAGE( Qt4 REQUIRED ) diff --git a/QJson.pc.in b/QJson.pc.in index 1111111..2222222 100644 --- a/QJson.pc.in +++ b/QJson.pc.in @@ -8,4 +8,4 @@ Description: QJson is a qt-based library that maps JSON data to QVariant objects Version: @QJSON_LIB_MAJOR_VERSION@.@QJSON_LIB_MINOR_VERSION@.@QJSON_LIB_PATCH_VERSION@ Requires: QtCore Libs: -L${libdir} -lqjson -Cflags: -I${includedir} \ No newline at end of file +Cflags: -I${includedir} @PKG_CONFIG_CFLAGS@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1111111..2222222 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -15,7 +15,12 @@ qt4_wrap_cpp(qjson_MOC_SRCS ${qjson_MOC_HDRS}) set (qjson_SRCS parser.cpp qobjecthelper.cpp json_scanner.cpp json_parser.cc parserrunnable.cpp serializer.cpp serializerrunnable.cpp) set (qjson_HEADERS parser.h parserrunnable.h qobjecthelper.h serializer.h serializerrunnable.h qjson_export.h) -add_library (qjson SHARED ${qjson_SRCS} ${qjson_MOC_SRCS} ${qjson_HEADERS}) +IF(LIBTYPE STREQUAL "STATIC") + add_library (qjson STATIC ${qjson_SRCS} ${qjson_MOC_SRCS} ${qjson_HEADERS}) +else() + add_library (qjson SHARED ${qjson_SRCS} ${qjson_MOC_SRCS} ${qjson_HEADERS}) +endif() + target_link_libraries( qjson ${QT_LIBRARIES}) if(NOT android) diff --git a/src/qjson_export.h b/src/qjson_export.h index 1111111..2222222 100644 --- a/src/qjson_export.h +++ b/src/qjson_export.h @@ -23,7 +23,9 @@ #include #ifndef QJSON_EXPORT -# if defined(QJSON_MAKEDLL) +# ifdef QJSON_STATIC +# define QJSON_EXPORT +# elif defined(QJSON_MAKEDLL) /* We are building this library */ # define QJSON_EXPORT Q_DECL_EXPORT # else