Changeset View
Changeset View
Standalone View
Standalone View
x11/virtualgl/files/patch-server__CMakeLists.txt
| --- ./server/CMakeLists.txt.orig 2013-09-27 06:10:02.000000000 +0100 | --- server/CMakeLists.txt.orig 2015-05-26 23:34:37 UTC | ||||
| +++ ./server/CMakeLists.txt 2014-08-10 17:43:04.000000000 +0100 | +++ server/CMakeLists.txt | ||||
| @@ -36,9 +36,9 @@ | @@ -73,9 +73,9 @@ if(MAPFLAG) | ||||
| set_source_files_properties(faker-sym.cpp PROPERTIES | set_source_files_properties(faker-sym.cpp PROPERTIES | ||||
| OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/faker-mapfile) | OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/faker-mapfile) | ||||
| set_target_properties(rrfaker PROPERTIES | set_target_properties(${VGL_RRFAKER_NAME} PROPERTIES | ||||
| - LINK_FLAGS "-z defs ${MAPFLAG}${CMAKE_CURRENT_BINARY_DIR}/faker-mapfile") | - LINK_FLAGS "-z defs ${MAPFLAG}${CMAKE_CURRENT_BINARY_DIR}/faker-mapfile") | ||||
| + LINK_FLAGS "-Wl,-z,defs ${MAPFLAG}${CMAKE_CURRENT_BINARY_DIR}/faker-mapfile") | + LINK_FLAGS "-Wl,-z,defs ${MAPFLAG}${CMAKE_CURRENT_BINARY_DIR}/faker-mapfile") | ||||
| else() | else() | ||||
| - set_target_properties(rrfaker PROPERTIES LINK_FLAGS "-z defs") | - set_target_properties(${VGL_RRFAKER_NAME} PROPERTIES LINK_FLAGS "-z defs") | ||||
| + set_target_properties(rrfaker PROPERTIES LINK_FLAGS "-Wl,-z,defs") | + set_target_properties(${VGL_RRFAKER_NAME} PROPERTIES LINK_FLAGS "-Wl,-z,defs") | ||||
| endif() | endif() | ||||
| target_link_libraries(rrfaker rrframe ${FBXFAKERLIB} rrsocket m | if(VGL_FAKEXCB) | ||||
| ${OPENGL_gl_LIBRARY} ${LIBDL}) | set(LIBXCB xcb xcb-glx xcb-keysyms X11-xcb) | ||||
| @@ -59,7 +59,7 @@ | @@ -99,7 +99,7 @@ target_link_libraries(${VGL_DLFAKER_NAME | ||||
| install(TARGETS dlfaker DESTINATION ${VGL_LIBDIR}) | install(TARGETS ${VGL_DLFAKER_NAME} DESTINATION ${VGL_LIBDIR}) | ||||
| add_library(gefaker SHARED gefaker.c) | add_library(${VGL_GEFAKER_NAME} SHARED gefaker.c) | ||||
| -set_target_properties(gefaker PROPERTIES LINK_FLAGS "-z defs") | -set_target_properties(${VGL_GEFAKER_NAME} PROPERTIES LINK_FLAGS "-z defs") | ||||
| +set_target_properties(gefaker PROPERTIES LINK_FLAGS "-Wl,-z,defs") | +set_target_properties(${VGL_GEFAKER_NAME} PROPERTIES LINK_FLAGS "-Wl,-z,defs") | ||||
| target_link_libraries(gefaker ${LIBDL}) | target_link_libraries(${VGL_GEFAKER_NAME} ${LIBDL}) | ||||
| install(TARGETS gefaker DESTINATION ${VGL_LIBDIR}) | install(TARGETS ${VGL_GEFAKER_NAME} DESTINATION ${VGL_LIBDIR}) | ||||
| @@ -119,8 +119,8 @@ | @@ -148,8 +148,8 @@ target_link_libraries(dlfakerut ${X11_X1 | ||||
| add_library(GLdlfakerut SHARED libGLdlfakerut.c) | add_library(GLdlfakerut SHARED libGLdlfakerut.c) | ||||
| add_executable(fakerut fakerut.cpp) | add_executable(fakerut fakerut.cpp fakerut-supplement.c) | ||||
| -target_link_libraries(fakerut "-z now ${OPENGL_gl_LIBRARY}" | -target_link_libraries(fakerut "-z now ${OPENGL_gl_LIBRARY}" | ||||
| - ${OPENGL_glu_LIBRARY} "-z now ${X11_X11_LIB}" ${LIBDL} pthread) | - ${OPENGL_glu_LIBRARY} "-z now ${X11_X11_LIB}" ${LIBDL} vglutil) | ||||
| +target_link_libraries(fakerut "-Wl,-z,now ${OPENGL_gl_LIBRARY}" | +target_link_libraries(fakerut "-Wl,-z,now ${OPENGL_gl_LIBRARY}" | ||||
| + ${OPENGL_glu_LIBRARY} "-Wl,-z,now ${X11_X11_LIB}" ${LIBDL} pthread) | + ${OPENGL_glu_LIBRARY} "-Wl,-z,now ${X11_X11_LIB}" ${LIBDL} vglutil) | ||||
| add_library(vgltrans_test SHARED testplugin.cpp vgltransconn.cpp) | add_library(vgltrans_test SHARED testplugin.cpp VGLTrans.cpp) | ||||
| if(VGL_USESSL AND CMAKE_SYSTEM_NAME STREQUAL "Linux") | if(VGL_USESSL AND CMAKE_SYSTEM_NAME STREQUAL "Linux") | ||||