Fix CMake flag restoration 63/221263/1
authorMichal Bloch <m.bloch@partner.samsung.com>
Mon, 30 Dec 2019 16:34:38 +0000 (17:34 +0100)
committerMichal Bloch <m.bloch@partner.samsung.com>
Mon, 30 Dec 2019 16:34:38 +0000 (17:34 +0100)
Change-Id: Ib098276c83720d88ac8cf1809065f1355067e1f4
Signed-off-by: Michal Bloch <m.bloch@partner.samsung.com>
src/CMakeLists.txt

index 07d0828..e9b1375 100644 (file)
@@ -155,8 +155,11 @@ ADD_EXECUTABLE(${RD_BINARY_NAME}
   ${SOURCES})
 
 SET(SAVE_EXTRA_CFLAGS ${EXTRA_CFLAGS})
+SET(SAVE_EXTRA_CFLAGS_RELEASE ${EXTRA_CFLAGS_RELEASE})
 SET(SAVE_CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
 SET(SAVE_CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE})
+SET(SAVE_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+SET(SAVE_CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE})
 SET(EXTRA_CFLAGS "")
 SET(EXTRA_CFLAGS_RELEASE "")
 SET(CMAKE_C_FLAGS "")
@@ -174,8 +177,11 @@ SET_TARGET_PROPERTIES(resourced_shared_test
 TARGET_LINK_LIBRARIES(resourced_shared_test ${RESOURCED_REQUIRE_PKGS_LDFLAGS})
 
 SET(EXTRA_CFLAGS ${SAVE_EXTRA_CFLAGS})
+SET(EXTRA_CFLAGS_RELEASE ${SAVE_EXTRA_CFLAGS_RELEASE})
 SET(CMAKE_C_FLAGS ${SAVE_CMAKE_C_FLAGS})
 SET(CMAKE_C_FLAGS_RELEASE ${SAVE_CMAKE_C_FLAGS_RELEASE})
+SET(CMAKE_CXX_FLAGS ${SAVE_CMAKE_CXX_FLAGS})
+SET(CMAKE_CXX_FLAGS_RELEASE ${SAVE_CMAKE_CXX_FLAGS_RELEASE})
 
 TARGET_LINK_LIBRARIES(${RD_BINARY_NAME}
   resourced-private-api ${RESOURCED_REQUIRE_PKGS_LDFLAGS} "-pie -ldl -lm -Wl,-rpath=${RD_PLUGIN_PATH}")