Peter M. Groen / dali-demo

Commit 7a4fb5b4bf9bf0c73761939bde321c48958a9117

Authored by Kimmo Hoikka
Committed by Gerrit Code Review
2 parents d12d21b7 d16fbfeb

Merge "Keep c++ flags from environment." into devel/master

Inline Side-by-side
Showing 1 changed file with 1 additions and 1 deletions
build/tizen/CMakeLists.txt
  View file @7a4fb5b
@@ -169,7 +169,7 @@ ENDIF(INTERNATIONALIZATION) @@ -169,7 +169,7 @@ ENDIF(INTERNATIONALIZATION)
169 ########################################################################### 169 ###########################################################################
170 170
171 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${REQUIRED_CFLAGS} ${DALI_DEMO_CFLAGS} -Werror -Wall -fPIE") 171 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${REQUIRED_CFLAGS} ${DALI_DEMO_CFLAGS} -Werror -Wall -fPIE")
172 -SET(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}") 172 +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_C_FLAGS}")
173 173
174 INCLUDE_DIRECTORIES(${ROOT_SRC_DIR}) 174 INCLUDE_DIRECTORIES(${ROOT_SRC_DIR})
175 #INCLUDE_DIRECTORIES(${DEMO_SRC_DIR}) 175 #INCLUDE_DIRECTORIES(${DEMO_SRC_DIR})