Sfoglia il codice sorgente

Move PIC for tests to common function

Alexey Edelev 5 anni fa
parent
commit
090c9a01fa

+ 4 - 1
cmake/QtProtobufCommon.cmake

@@ -58,7 +58,10 @@ function(add_test_target)
         GENERATED_HEADERS ${add_test_target_GENERATED_HEADERS})
 
     add_executable(${add_test_target_TARGET} ${add_test_target_SOURCES})
-    set_target_properties(${add_test_target_TARGET} PROPERTIES POSITION_INDEPENDENT_CODE FALSE)
+    if(Qt5_POSITION_INDEPENDENT_CODE)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+        set_target_properties(${add_test_target_TARGET} PROPERTIES POSITION_INDEPENDENT_CODE FALSE)
+    endif()
     add_dependencies(${add_test_target_TARGET} ${QtProtobuf_GENERATED})
     target_link_libraries(${add_test_target_TARGET} gtest_main gtest ${QtProtobuf_GENERATED} ${GRPC_LIBRARY_TARGET} ${PROTOBUF_LIBRARY_TARGET} Qt5::Core Qt5::Qml Qt5::Network)
     target_include_directories(${add_test_target_TARGET} PRIVATE ${GENERATED_SOURCES_DIR})

+ 0 - 1
tests/test_grpc/CMakeLists.txt

@@ -9,7 +9,6 @@ set(GENERATED_HEADERS
 file(GLOB SOURCES main.cpp
 #    servertest.cpp
     clienttest.cpp)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
 add_test_target(TARGET ${TARGET}
     GENERATED_HEADERS ${GENERATED_HEADERS}
     SOURCES ${SOURCES})

+ 0 - 1
tests/test_protobuf/CMakeLists.txt

@@ -137,7 +137,6 @@ file(GLOB SOURCES
     deserializationtest.cpp
     serializationcomplexmessagemap.cpp)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
 add_test_target(TARGET ${TARGET}
     GENERATED_HEADERS ${GENERATED_HEADERS}
     SOURCES ${SOURCES})