Lines 1-43
Link Here
|
1 |
--- server/CMakeLists.txt.orig 2015-05-26 23:34:37 UTC |
|
|
2 |
+++ server/CMakeLists.txt |
3 |
@@ -21,6 +21,8 @@ configure_file(vendor.h.in vendor.h) |
4 |
include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} |
5 |
../common) |
6 |
|
7 |
+ADD_DEFINITIONS(-fPIC) |
8 |
+ |
9 |
set(FBXFAKERLIB fbx-faker) |
10 |
if(VGL_USEXV) |
11 |
set(FBXFAKERLIB ${FBXFAKERLIB};fbxv) |
12 |
@@ -73,9 +75,9 @@ if(MAPFLAG) |
13 |
set_source_files_properties(faker-sym.cpp PROPERTIES |
14 |
OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/faker-mapfile) |
15 |
set_target_properties(${VGL_RRFAKER_NAME} PROPERTIES |
16 |
- LINK_FLAGS "-z defs ${MAPFLAG}${CMAKE_CURRENT_BINARY_DIR}/faker-mapfile") |
17 |
+ LINK_FLAGS "-Wl,-z,defs ${MAPFLAG}${CMAKE_CURRENT_BINARY_DIR}/faker-mapfile") |
18 |
else() |
19 |
- set_target_properties(${VGL_RRFAKER_NAME} PROPERTIES LINK_FLAGS "-z defs") |
20 |
+ set_target_properties(${VGL_RRFAKER_NAME} PROPERTIES LINK_FLAGS "-Wl,-z,defs") |
21 |
endif() |
22 |
if(VGL_FAKEXCB) |
23 |
set(LIBXCB xcb xcb-glx xcb-keysyms X11-xcb) |
24 |
@@ -99,7 +101,7 @@ target_link_libraries(${VGL_DLFAKER_NAME |
25 |
install(TARGETS ${VGL_DLFAKER_NAME} DESTINATION ${VGL_LIBDIR}) |
26 |
|
27 |
add_library(${VGL_GEFAKER_NAME} SHARED gefaker.c) |
28 |
-set_target_properties(${VGL_GEFAKER_NAME} PROPERTIES LINK_FLAGS "-z defs") |
29 |
+set_target_properties(${VGL_GEFAKER_NAME} PROPERTIES LINK_FLAGS "-Wl,-z,defs") |
30 |
target_link_libraries(${VGL_GEFAKER_NAME} ${LIBDL}) |
31 |
install(TARGETS ${VGL_GEFAKER_NAME} DESTINATION ${VGL_LIBDIR}) |
32 |
|
33 |
@@ -148,8 +150,8 @@ target_link_libraries(dlfakerut ${X11_X1 |
34 |
add_library(GLdlfakerut SHARED libGLdlfakerut.c) |
35 |
|
36 |
add_executable(fakerut fakerut.cpp fakerut-supplement.c) |
37 |
-target_link_libraries(fakerut "-z now ${OPENGL_gl_LIBRARY}" |
38 |
- ${OPENGL_glu_LIBRARY} "-z now ${X11_X11_LIB}" ${LIBDL} vglutil) |
39 |
+target_link_libraries(fakerut "-Wl,-z,now ${OPENGL_gl_LIBRARY}" |
40 |
+ ${OPENGL_glu_LIBRARY} "-Wl,-z,now ${X11_X11_LIB}" ${LIBDL} vglutil) |
41 |
|
42 |
add_library(vgltrans_test SHARED testplugin.cpp VGLTrans.cpp) |
43 |
if(VGL_USESSL AND CMAKE_SYSTEM_NAME STREQUAL "Linux") |