From 63861f2ee5454d76f8a1c3b0207621e22764c1b9 Mon Sep 17 00:00:00 2001 From: David Sansome Date: Tue, 22 Jun 2010 16:07:29 +0000 Subject: [PATCH] Explicitly produce static libraries even when BUILD_SHARED_LIBS is set --- 3rdparty/qtiocompressor/CMakeLists.txt | 2 +- 3rdparty/qtsingleapplication/CMakeLists.txt | 2 +- 3rdparty/qxt/CMakeLists.txt | 2 +- src/CMakeLists.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/3rdparty/qtiocompressor/CMakeLists.txt b/3rdparty/qtiocompressor/CMakeLists.txt index 3d3dfcfd0..f339daba9 100644 --- a/3rdparty/qtiocompressor/CMakeLists.txt +++ b/3rdparty/qtiocompressor/CMakeLists.txt @@ -10,7 +10,7 @@ set(IOCOMPRESSOR-MOC-HEADERS QT4_WRAP_CPP(IOCOMPRESSOR-SOURCES-MOC ${IOCOMPRESSOR-MOC-HEADERS}) -ADD_LIBRARY(qtiocompressor +ADD_LIBRARY(qtiocompressor STATIC ${IOCOMPRESSOR-SOURCES} ${IOCOMPRESSOR-SOURCES-MOC} ) diff --git a/3rdparty/qtsingleapplication/CMakeLists.txt b/3rdparty/qtsingleapplication/CMakeLists.txt index 6b165235d..1d78baba4 100644 --- a/3rdparty/qtsingleapplication/CMakeLists.txt +++ b/3rdparty/qtsingleapplication/CMakeLists.txt @@ -21,7 +21,7 @@ endif(WIN32) QT4_WRAP_CPP(SINGLEAPP-SOURCES-MOC ${SINGLEAPP-MOC-HEADERS}) -ADD_LIBRARY(qtsingleapplication +ADD_LIBRARY(qtsingleapplication STATIC ${SINGLEAPP-SOURCES} ${SINGLEAPP-SOURCES-MOC} ) diff --git a/3rdparty/qxt/CMakeLists.txt b/3rdparty/qxt/CMakeLists.txt index 2d5328a1a..5d0c9e21c 100644 --- a/3rdparty/qxt/CMakeLists.txt +++ b/3rdparty/qxt/CMakeLists.txt @@ -19,7 +19,7 @@ endif(WIN32) QT4_WRAP_CPP(QXT-SOURCES-MOC ${QXT-MOC-HEADERS}) -ADD_LIBRARY(qxt +ADD_LIBRARY(qxt STATIC ${QXT-SOURCES} ${QXT-SOURCES-MOC} ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2487873d1..c74cd2a83 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -427,7 +427,7 @@ add_po(PO clementine_ DIRECTORY translations ) -add_library(clementine_lib +add_library(clementine_lib STATIC ${SOURCES} ${MOC} ${UIC}