From 064249deeb996be3a837c7eacc9330903d89f480 Mon Sep 17 00:00:00 2001 From: David Sansome Date: Sat, 4 May 2013 14:04:00 +0000 Subject: [PATCH] Fix a libmygpo-qt linker error on windows --- 3rdparty/libmygpo-qt/CMakeLists.txt | 1 - CMakeLists.txt | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty/libmygpo-qt/CMakeLists.txt b/3rdparty/libmygpo-qt/CMakeLists.txt index 0d1b4d6d7..c09d91448 100644 --- a/3rdparty/libmygpo-qt/CMakeLists.txt +++ b/3rdparty/libmygpo-qt/CMakeLists.txt @@ -4,7 +4,6 @@ set( MYGPO_QT_VERSION_MINOR "0" ) set( MYGPO_QT_VERSION_PATCH "7" ) configure_file( Version.h.in ${CMAKE_CURRENT_BINARY_DIR}/Version.h ) include_directories("${QJSON_INCLUDEDIR}/qjson") -add_definitions(-DMYGPO_EXPORT=) include_directories( ${QT_INCLUDES} ${QJSON_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) diff --git a/CMakeLists.txt b/CMakeLists.txt index fb52f6d7b..97fb2376f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -422,6 +422,7 @@ if(LIBMYGPO_QT_FOUND) set(MYGPOQT_LIBRARIES ${LIBMYGPO_QT_LIBRARIES}) set(MYGPOQT_INCLUDE_DIRS ${LIBMYGPO_QT_INCLUDE_DIRS}) else() + add_definitions(-DMYGPO_EXPORT=) add_subdirectory(3rdparty/libmygpo-qt) set(MYGPOQT_LIBRARIES mygpo-qt) set(MYGPOQT_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/3rdparty/libmygpo-qt/)