diff options
author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-05-22 07:40:35 (GMT) |
---|---|---|
committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-05-22 07:40:35 (GMT) |
commit | 1e66bfd04f864a040b1e4a68f0db0f55f15b91a3 (patch) | |
tree | c254dc899d79e0fc6962ef2d2d5dfc26de1a6766 /contrib/cmake | |
parent | f9a620340ddce2a17fd775d1e210268cac13377b (diff) | |
download | uscxml-1e66bfd04f864a040b1e4a68f0db0f55f15b91a3.zip uscxml-1e66bfd04f864a040b1e4a68f0db0f55f15b91a3.tar.gz uscxml-1e66bfd04f864a040b1e4a68f0db0f55f15b91a3.tar.bz2 |
Builds with MSVC again
Diffstat (limited to 'contrib/cmake')
-rw-r--r-- | contrib/cmake/FindICONV.cmake | 1 | ||||
-rw-r--r-- | contrib/cmake/FindMILES.cmake | 23 |
2 files changed, 24 insertions, 0 deletions
diff --git a/contrib/cmake/FindICONV.cmake b/contrib/cmake/FindICONV.cmake index a95bc65..8e0d636 100644 --- a/contrib/cmake/FindICONV.cmake +++ b/contrib/cmake/FindICONV.cmake @@ -1,3 +1,4 @@ +# From https://github.com/onyx-intl/cmake_modules/blob/master/FindIconv.cmake # - Try to find Iconv # Once done this will define # diff --git a/contrib/cmake/FindMILES.cmake b/contrib/cmake/FindMILES.cmake index 0e073a1..9a166cd 100644 --- a/contrib/cmake/FindMILES.cmake +++ b/contrib/cmake/FindMILES.cmake @@ -59,6 +59,7 @@ FIND_PATH(MILES_INCLUDE_DIR miles/miles.h SET(MILES_LIBRARIES) list(LENGTH MILES_FIND_COMPONENTS MILES_NR_COMPONENTS) + if (MILES_NR_COMPONENTS GREATER 0) foreach (_MILES_COMPONENT ${_MILES_COMPONENTS_TO_PROCESS}) SET(_CURR_COMPONENT "MILES_${_MILES_COMPONENT}_LIBRARY") @@ -71,6 +72,7 @@ if (MILES_NR_COMPONENTS GREATER 0) PATHS ${_MILES_LIB_SEARCHPATH} ENV MILES_LIB_DIR ) + if (${_CURR_COMPONENT}) list(APPEND MILES_LIBRARIES optimized ${${_CURR_COMPONENT}}) else() @@ -116,6 +118,7 @@ else() PATHS ${_MILES_LIB_SEARCHPATH} ENV MILES_LIB_DIR ) + if (MILES_RELEASE) list(APPEND MILES_LIBRARIES optimized ${MILES_RELEASE}) else() @@ -126,6 +129,7 @@ else() PATHS ${_MILES_LIB_SEARCHPATH} ENV MILES_LIB_DIR ) + if (MILES_RELEASE) list(APPEND MILES_LIBRARIES optimized ${MILES_RELEASE}) endif() @@ -151,7 +155,26 @@ else() list(APPEND MILES_LIBRARIES debug ${MILES_DEBUG}) endif() endif() +endif() + +if (MILES_INCLUDE_DIR AND MILES_LIBRARIES) + if (APPLE) + find_library(FRAMEWORK_FOUNDATION NAMES Foundation) + list(APPEND MILES_LIBRARIES "${FRAMEWORK_FOUNDATION}") + + find_library(FRAMEWORK_AVFOUNDATION NAMES AVFoundation) + list(APPEND MILES_LIBRARIES "${FRAMEWORK_AVFOUNDATION}") + find_library(FRAMEWORK_COREMEDIA NAMES CoreMedia) + list(APPEND MILES_LIBRARIES "${FRAMEWORK_COREMEDIA}") + + find_library(FRAMEWORK_COREVIDEO NAMES CoreVideo) + list(APPEND MILES_LIBRARIES "${FRAMEWORK_COREVIDEO}") + endif() + + FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 c + list(APPEND MILES_LIBRARIES "${ICONV_LIBRARIES}") + ) endif() INCLUDE(FindPackageHandleStandardArgs) |