diff options
Diffstat (limited to 'hicn-light/src/hicn/command_line')
| -rw-r--r-- | hicn-light/src/hicn/command_line/controller/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | hicn-light/src/hicn/command_line/daemon/CMakeLists.txt | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/hicn-light/src/hicn/command_line/controller/CMakeLists.txt b/hicn-light/src/hicn/command_line/controller/CMakeLists.txt index 68caa7dc8..4cbd49220 100644 --- a/hicn-light/src/hicn/command_line/controller/CMakeLists.txt +++ b/hicn-light/src/hicn/command_line/controller/CMakeLists.txt @@ -20,11 +20,16 @@ if (WIN32) endif() if (NOT DISABLE_EXECUTABLES) + if (${CMAKE_SYSTEM_NAME} MATCHES Android) + set(LINK_FLAGS "-Wl,--unresolved-symbols=ignore-in-object-files") + endif() + build_executable(${HICN_LIGHT_CONTROL} SOURCES ${CONTROLLER_SRC} - LINK_LIBRARIES ${HICN_LIGHT_LINK_LIBRARIES} + LINK_LIBRARIES ${LIBHICN_LIGHT_STATIC} DEPENDS ${LIBHICN_LIGHT_STATIC} COMPONENT ${HICN_LIGHT} DEFINITIONS ${COMPILER_DEFINITIONS} + LINK_FLAGS ${LINK_FLAGS} ) endif () diff --git a/hicn-light/src/hicn/command_line/daemon/CMakeLists.txt b/hicn-light/src/hicn/command_line/daemon/CMakeLists.txt index ce62b51e2..a86826f09 100644 --- a/hicn-light/src/hicn/command_line/daemon/CMakeLists.txt +++ b/hicn-light/src/hicn/command_line/daemon/CMakeLists.txt @@ -14,14 +14,15 @@ list(APPEND DAEMON_SRC hicnLightDaemon_main.c ) + if (WIN32) - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:\"LIBCMT\"" ) + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:\"LIBCMT\"") endif() -if (NOT DISABLE_EXECUTABLES) +if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Android") build_executable(${HICN_LIGHT_DAEMON} SOURCES ${DAEMON_SRC} - LINK_LIBRARIES ${HICN_LIGHT_LINK_LIBRARIES} + LINK_LIBRARIES ${LIBHICN_LIGHT_STATIC} DEPENDS ${LIBHICN_LIGHT_STATIC} COMPONENT ${HICN_LIGHT} DEFINITIONS ${COMPILER_DEFINITIONS} |