From 8fea75ec5ea41b347bae5b24f5f6cebe3247449c Mon Sep 17 00:00:00 2001 From: "Angelo Mantellini (manangel)" Date: Wed, 5 Jul 2017 16:00:49 +0200 Subject: correct issue for compiling ios Change-Id: I0b55752383af8e8d8e10ccf09dc515edf93ee41c Signed-off-by: Angelo Mantellini (manangel) --- libdash/CMakeLists.txt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'libdash/CMakeLists.txt') diff --git a/libdash/CMakeLists.txt b/libdash/CMakeLists.txt index ada76ad8..91353390 100644 --- a/libdash/CMakeLists.txt +++ b/libdash/CMakeLists.txt @@ -12,6 +12,12 @@ if(ANDROID_API) set(CURL_LIBRARIES "$ENV{DISTILLERY_ROOT_DIR}/usr/lib/libcurl.a" "$ENV{DISTILLERY_ROOT_DIR}/usr/lib/libcurl-library.a") set(ANDROID_LIBRARIES "${ANDROID_NDK}/platforms/android-23/arch-arm/usr/lib/libz.a" "$ENV{NDK}/sources/cxx-stl/gnu-libstdc++/4.9/libs/$ENV{ABI}/libgnustl_shared.so" "${ANDROID_NDK}/platforms/android-23/arch-arm/usr/lib/liblog.so") set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} ${ANDROID_C_FLAGS} -std=c++0x -g -DLOG_BUILD") +elseif (COMPILE_FOR_IOS) + set(CMAKE_CXX_FLAGS "-std=c++0x -g -DLOG_BUILD") + find_package(LibXml2 REQUIRED) + find_host_package(OpenSSL REQUIRED) + find_package(ZLIB REQUIRED) + find_host_package(CURL REQUIRED) else () set(CMAKE_CXX_FLAGS "-std=c++0x -g -DLOG_BUILD") find_package(LibXml2 REQUIRED) @@ -179,7 +185,11 @@ include_directories(${WLIB_INCLUDE_DIRS}) include_directories(${CURL_INCLUDE_DIRS}) include_directories(include) -add_library(dash SHARED ${SOURCE_FILES}) +if (COMPILE_FOR_IOS OR COMPILE_FOR_IOS_SIMULATOR) + add_library(dash STATIC ${SOURCE_FILES}) +else() + add_library(dash SHARED ${SOURCE_FILES}) +endif() set_target_properties(dash PROPERTIES LINKER_LANGUAGE CXX) target_link_libraries(dash ${CURL_LIBRARIES} ${ZLIB_LIBRARIES} ${CURL_LIBRARIES} ${LIBXML2_LIBRARIES} ${CURL_LIBRARIES} ${ANDROID_LIBRARIES} ${CURL_LIBRARIES}) message("libxml ${LIBXML2_LIBRARIES} ${LIBXML2_INCLUDE_DIR}") -- cgit 1.2.3-korg