Commit 0a0a8a4ac8d5a607ca31cdca9c0fff9e1123b768
1 parent
e2023504
Ensure 64-bit android build works as well
Change-Id: I2031cc6b7a436a87a9a229ebc0d1650336e2fee0
Showing
1 changed file
with
6 additions
and
2 deletions
build/tizen/builder/CMakeLists.txt
| ... | ... | @@ -2,6 +2,10 @@ SET(BUILDER_SRC_DIR ${ROOT_SRC_DIR}/builder) |
| 2 | 2 | |
| 3 | 3 | SET(DALI_BUILDER_SRCS ${BUILDER_SRC_DIR}/dali-builder.cpp) |
| 4 | 4 | SET(DALI_BUILDER_SRCS ${DALI_BUILDER_SRCS} "${ROOT_SRC_DIR}/shared/resources-location.cpp") |
| 5 | -ADD_EXECUTABLE(dali-builder ${DALI_BUILDER_SRCS}) | |
| 6 | -TARGET_LINK_LIBRARIES(dali-builder ${REQUIRED_PKGS_LDFLAGS}) | |
| 5 | +IF(SHARED) | |
| 6 | + ADD_LIBRARY(dali-builder SHARED ${DALI_BUILDER_SRCS}) | |
| 7 | +ELSE() | |
| 8 | + ADD_EXECUTABLE(dali-builder ${DALI_BUILDER_SRCS}) | |
| 9 | +ENDIF() | |
| 10 | +TARGET_LINK_LIBRARIES(dali-builder ${REQUIRED_PKGS_LDFLAGS} -pie) | |
| 7 | 11 | INSTALL(TARGETS dali-builder DESTINATION ${BINDIR}) | ... | ... |