diff --git a/CMakeLists.txt b/CMakeLists.txt index 736210f3..9f914733 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -102,13 +102,13 @@ else() endif() # Since gcc 4.9 the LTO format is non-standard (slim), so we need the gcc-specific ar and ranlib binaries - if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9.0) AND NOT (MAKE_SYSTEM_NAME STREQUAL "Android")) + ##if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9.0) AND NOT (MAKE_SYSTEM_NAME STREQUAL "Android")) ## set(CMAKE_AR "gcc-ar") ## set(CMAKE_RANLIB "gcc-ranlib") - elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT APPLE AND NOT (MAKE_SYSTEM_NAME STREQUAL "Android")) + ##elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT APPLE AND NOT (MAKE_SYSTEM_NAME STREQUAL "Android")) ## set(CMAKE_AR "llvm-ar") ## set(CMAKE_RANLIB "llvm-ranlib") - endif() + ##endif() if(MINGW) @@ -175,19 +175,19 @@ if(STATIC) set(Boost_USE_STATIC_RUNTIME ON) endif() -#message("CMAKE_SYSTEM_NAME: ${CMAKE_SYSTEM_NAME}") -#if(CMAKE_SYSTEM_NAME STREQUAL "iOS") -# set(Boost_INCLUDE_DIRS "/Users/roky/projects/Zano/mobile_repo/ofxiOSBoost/libs/boost/include") -# set(Boost_LIBRARY_DIRS "/Users/roky/projects/Zano/mobile_repo/ofxiOSBoost/libs/boost/ios/") -# set(Boost_LIBRARIES "libboost.a") -# set(Boost_VERSION "ofxiOSBoost 1.60.0") -#elseif(MAKE_SYSTEM_NAME STREQUAL "Android") +message("CMAKE_SYSTEM_NAME: ${CMAKE_SYSTEM_NAME}") +if(CMAKE_SYSTEM_NAME STREQUAL "iOS") + set(Boost_INCLUDE_DIRS "/Users/roky/projects/Zano/mobile_repo/ofxiOSBoost/libs/boost/include") + set(Boost_LIBRARY_DIRS "/Users/roky/projects/Zano/mobile_repo/ofxiOSBoost/libs/boost/ios/") + set(Boost_LIBRARIES "libboost.a") + set(Boost_VERSION "ofxiOSBoost 1.60.0") +elseif(MAKE_SYSTEM_NAME STREQUAL "Android") set(Boost_INCLUDE_DIRS "/Users/roky/projects/Zano/mobile_repo/Boost-for-Android-Prebuilt/boost_1_68_0-clang/include") set(Boost_LIBRARY_DIRS "/Users/roky/projects/Zano/mobile_repo/Boost-for-Android-Prebuilt/boost_1_68_0-clang/armeabi-v7a/lib") set(Boost_LIBRARIES "libboost_system.a libboost_filesystem.a libboost_thread.a libboost_timer.a libboost_date_time.a libboost_chrono.a libboost_regex.a libboost_serialization.a libboost_atomic.a libboost_program_options.a libboost_locale.a") set(Boost_VERSION "PurpleI2PBoost 1.68.0") -# else() -# find_package(Boost 1.55 REQUIRED COMPONENTS system filesystem thread timer date_time chrono regex serialization atomic program_options locale) +else() + find_package(Boost 1.55 REQUIRED COMPONENTS system filesystem thread timer date_time chrono regex serialization atomic program_options locale) #endif()