summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt59
-rwxr-xr-xcontrib/local/compress_and_upload_deps.sh1
2 files changed, 34 insertions, 26 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 938e8ba..814c099 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@ SET(USCXML_VERSION_MINOR "0")
SET(USCXML_VERSION_PATCH "5")
SET(USCXML_VERSION ${USCXML_VERSION_MAJOR}.${USCXML_VERSION_MINOR}.${USCXML_VERSION_PATCH})
-# build type has to be set before the project definition
+# build type has to be set before the project definition4
SET(BUILD_TYPE_HELP "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug, Release, RelWithDebInfo, MinSizeRel.")
IF(DEFINED CMAKE_BUILD_TYPE)
SET(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING ${BUILD_TYPE_HELP})
@@ -387,19 +387,17 @@ if (NOT WIN32)
set(XML_LIBRARIES ${LIBXML2_LIBRARIES})
list (APPEND USCXML_CORE_LIBS "dl")
list (APPEND USCXML_CORE_LIBS "pthread")
- if (APPLE)
- if (IOS)
- find_library(COREFOUNDATION_LIBRARY CoreFoundation)
- list (APPEND USCXML_CORE_LIBS ${COREFOUNDATION_LIBRARY}/CoreFoundation)
- find_library(SECURITY_LIBRARY Security)
- list (APPEND USCXML_CORE_LIBS ${SECURITY_LIBRARY}/Security)
- list (APPEND USCXML_CORE_LIBS "z")
- else()
- find_library(APP_SERVICES_LIBRARY ApplicationServices)
- find_library(COREFOUNDATION_LIBRARY CoreFoundation)
- list (APPEND USCXML_CORE_LIBS ${APP_SERVICES_LIBRARY})
- list (APPEND USCXML_CORE_LIBS ${COREFOUNDATION_LIBRARY})
- endif()
+ if (IOS)
+ find_library(COREFOUNDATION_LIBRARY CoreFoundation)
+ list (APPEND USCXML_CORE_LIBS ${COREFOUNDATION_LIBRARY}/CoreFoundation)
+ find_library(SECURITY_LIBRARY Security)
+ list (APPEND USCXML_CORE_LIBS ${SECURITY_LIBRARY}/Security)
+ list (APPEND USCXML_CORE_LIBS "z")
+ elseif(APPLE)
+ find_library(APP_SERVICES_LIBRARY ApplicationServices)
+ find_library(COREFOUNDATION_LIBRARY CoreFoundation)
+ list (APPEND USCXML_CORE_LIBS ${APP_SERVICES_LIBRARY})
+ list (APPEND USCXML_CORE_LIBS ${COREFOUNDATION_LIBRARY})
endif()
elseif(WIN32)
list (APPEND XML_LIBRARIES "Ws2_32")
@@ -449,9 +447,15 @@ list (APPEND USCXML_CORE_LIBS ${EVENT_LIBRARY})
if (APPLE OR IOS)
find_library(JSC_LIBRARY JavaScriptCore)
if (IOS)
- list (APPEND USCXML_CORE_LIBS ${JSC_LIBRARY}/JavaScriptCore)
+ find_library(WTF_LIBRARY WTF)
+ find_library(FOUNDATION_LIBRARY Foundation)
+ find_library(ICU_LIBRARY icucore REQUIRED)
+ list (APPEND USCXML_OPT_LIBS ${JSC_LIBRARY})
+ list (APPEND USCXML_OPT_LIBS ${WTF_LIBRARY})
+ list (APPEND USCXML_OPT_LIBS ${ICU_LIBRARY})
+ list (APPEND USCXML_OPT_LIBS ${FOUNDATION_LIBRARY}/Foundation)
else()
- list (APPEND USCXML_CORE_LIBS ${JSC_LIBRARY})
+ list (APPEND USCXML_OPT_LIBS ${JSC_LIBRARY})
endif()
set(JSC_FOUND ON)
else()
@@ -491,16 +495,17 @@ if (FFMPEG_FOUND)
include_directories (${FFMPEG_INCLUDE_DIR})
endif()
-if (WIN32)
- find_package(UMUNDO COMPONENTS convenience)
-else()
- find_package(UMUNDO COMPONENTS rpc serial core)
-endif()
-if (UMUNDO_FOUND)
- include_directories (${UMUNDO_INCLUDE_DIR})
- list (APPEND USCXML_OPT_LIBS ${UMUNDO_LIBRARIES})
-# add_definitions("-DUMUNDO_STATIC")
-endif()
+
+# if (WIN32)
+# find_package(UMUNDO COMPONENTS convenience)
+# else()
+# find_package(UMUNDO COMPONENTS rpc serial core)
+# endif()
+# if (UMUNDO_FOUND)
+# include_directories (${UMUNDO_INCLUDE_DIR})
+# list (APPEND USCXML_OPT_LIBS ${UMUNDO_LIBRARIES})
+# # add_definitions("-DUMUNDO_STATIC")
+# endif()
if (UNIX)
set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_SHARED}) # link dynamically!
@@ -592,6 +597,8 @@ if (BUILD_AS_PLUGINS)
target_link_libraries(uscxml ${USCXML_CORE_LIBS})
else()
add_library(uscxml ${USCXML_FILES})
+ message("USCXML_OPT_LIBS: ${USCXML_OPT_LIBS}")
+ message("USCXML_CORE_LIBS: ${USCXML_CORE_LIBS}")
target_link_libraries(uscxml ${USCXML_OPT_LIBS} ${USCXML_CORE_LIBS})
endif()
diff --git a/contrib/local/compress_and_upload_deps.sh b/contrib/local/compress_and_upload_deps.sh
index 3cc9684..4ab1918 100755
--- a/contrib/local/compress_and_upload_deps.sh
+++ b/contrib/local/compress_and_upload_deps.sh
@@ -31,6 +31,7 @@ cd ../prebuilt
ssh ${USCXML_PREBUILT_HOST} mkdir -p ${USCXML_PREBUILT_PATH}/${VERSION}
PLATFORMS=`find . -maxdepth 1 -type d -regex ./[^\.].*`
+PLATFORMS="ios"
for FILE in ${PLATFORMS}; do
PLATFORM=`basename $FILE`
if [ "$PLATFORM" != "include" ]; then