summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Fonseca <jose.r.fonseca@gmail.com>2011-10-05 07:50:57 +0100
committerJosé Fonseca <jose.r.fonseca@gmail.com>2011-10-05 07:50:57 +0100
commitaf7e64a9c2ec95d7a9e6e3f4fb0eceb8aa6a87e2 (patch)
tree236e224535d581f600c5d1eaebf264a18e73dce2
parent568b271fe00e9489761d2b96a89bdfbfd709953a (diff)
Always build the common library as static.
The wrappers rely on that. Fixes build with -DBUILD_SHARED_LIBS:BOOL=ON (issue #44).
-rwxr-xr-xCMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 121a322..7d5db92 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -203,7 +203,7 @@ else (WIN32)
set (glws glws_glx.cpp)
endif (WIN32)
-add_library (common
+add_library (common STATIC
common/trace_file.cpp
common/trace_snappyfile.cpp
common/trace_model.cpp
@@ -221,7 +221,7 @@ add_library (common
set_target_properties (common PROPERTIES
# Ensure it can be statically linked in shared libraries
- COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS}"
+ COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_CXX_FLAGS}"
)
link_libraries (common)