summaryrefslogtreecommitdiffstats
path: root/common/network
diff options
context:
space:
mode:
authorPierre Ossman <ossman@cendio.se>2011-08-22 11:38:35 +0000
committerPierre Ossman <ossman@cendio.se>2011-08-22 11:38:35 +0000
commit92b4f9de986c5a9b72af8af61b8d3afcab1581d5 (patch)
tree0652876728abfca1e458574ebe926a7edd136f19 /common/network
parent04c4bad82febd8e5ec1fed5fb62fd46b78c2886b (diff)
downloadtigervnc-92b4f9de986c5a9b72af8af61b8d3afcab1581d5.tar.gz
tigervnc-92b4f9de986c5a9b72af8af61b8d3afcab1581d5.zip
CMake doesn't handle convenience libraries as nicely as autotools does. We
need to be explicit with -fPIC here as we use these in libvnc.so. git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4645 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'common/network')
-rw-r--r--common/network/CMakeLists.txt8
1 files changed, 8 insertions, 0 deletions
diff --git a/common/network/CMakeLists.txt b/common/network/CMakeLists.txt
index ddde5745..681d2912 100644
--- a/common/network/CMakeLists.txt
+++ b/common/network/CMakeLists.txt
@@ -3,6 +3,14 @@ include_directories(${CMAKE_SOURCE_DIR}/common)
add_library(network STATIC
TcpSocket.cxx)
+# This code goes into libvnc.so, so it needs to be PIC on x86_64.
+# (It should be on archs as well, but we prefer performance over memory
+# efficiency. Win64 is excluded because PIC is always on there and it
+# complains when you give it the explicit flag.)
+if(CMAKE_COMPILER_IS_GNUCXX AND (CMAKE_SIZEOF_VOID_P MATCHES 8) AND NOT WIN32)
+ set_target_properties(network PROPERTIES COMPILE_FLAGS -fPIC)
+endif()
+
if(UNIX)
libtool_create_control_file(network)
endif()