From 37a148f6e35523fd2bbbdbc37e6ed838684c6d90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 1 Sep 2015 09:46:46 +0200 Subject: Use STATIC libraries to prevent them being shared This can happen when user override definition of -DBUILD_SHARED_LIBS=ON. Without this hard-enforce the libraries would be generated as shared while never installed. Thus resulting in broken binaries. --- libmd5/CMakeLists.txt | 2 +- qtools/CMakeLists.txt | 2 +- src/CMakeLists.txt | 4 ++-- vhdlparser/CMakeLists.txt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libmd5/CMakeLists.txt b/libmd5/CMakeLists.txt index 4d98d01..ae7e111 100644 --- a/libmd5/CMakeLists.txt +++ b/libmd5/CMakeLists.txt @@ -1,3 +1,3 @@ -add_library(md5 +add_library(md5 STATIC md5.c ) diff --git a/qtools/CMakeLists.txt b/qtools/CMakeLists.txt index 96c0f27..17f8eb4 100644 --- a/qtools/CMakeLists.txt +++ b/qtools/CMakeLists.txt @@ -52,6 +52,6 @@ qwaitcondition_win32.cpp ) endif() -add_library(qtools +add_library(qtools STATIC ${qtools_src} ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 155bf77..eb030d4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -106,7 +106,7 @@ FLEX_TARGET(config config.l ${GENERATED_SRC}/config.cpp BISON_TARGET(vhdlparser vhdlparser.y ${GENERATED_SRC}/vhdlparser.cpp COMPILE_FLAGS "-l -p vhdlscannerYY") BISON_TARGET(constexp constexp.y ${GENERATED_SRC}/ce_parse.cpp COMPILE_FLAGS "-l -p constexpYY") -add_library(doxycfg +add_library(doxycfg STATIC ${GENERATED_SRC}/lang_cfg.h ${GENERATED_SRC}/config.cpp ${GENERATED_SRC}/configoptions.cpp @@ -114,7 +114,7 @@ add_library(doxycfg portable_c.c ) -add_library(_doxygen +add_library(_doxygen STATIC # custom generated files ${GENERATED_SRC}/lang_cfg.h ${GENERATED_SRC}/settings.h diff --git a/vhdlparser/CMakeLists.txt b/vhdlparser/CMakeLists.txt index e1e4ab1..1f60ae0 100644 --- a/vhdlparser/CMakeLists.txt +++ b/vhdlparser/CMakeLists.txt @@ -1,5 +1,5 @@ include_directories(${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/qtools) -add_library(vhdlparser +add_library(vhdlparser STATIC CharStream.cc ParseException.cc Token.cc -- cgit v0.12