diff options
| author |  Hoa V. DINH <dinh.viet.hoa@gmail.com> | 2014-01-16 21:48:43 -0800 |
|---|---|---|
| committer | Hoa V. DINH <dinh.viet.hoa@gmail.com> | 2014-01-16 21:48:43 -0800 |
| commit | c6a69e24a0be5216e2bfcceaa69f6037cea41b4a (patch) | |
| tree | dcf6eb389b4b64499bb1c074c15dc01eaf5471d4 /src/CMakeLists.txt | |
| parent | 5fc6d09983b41fc02e3601565b0f925e2ae70bc8 (diff) | |
Revert "Fixed build"
This reverts commit a14de1c4ef5906f68e890635ae56aa4db2c0cde1.
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 38 |
1 files changed, 6 insertions, 32 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6a4bd029..3c368309 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,23 +1,6 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) IF(APPLE) - set(dir "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk") - IF(EXISTS "${dir}" AND IS_DIRECTORY "${dir}") - set(SDKROOT "${dir}") - ELSE() - set(dir "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk") - IF(EXISTS "${dir}" AND IS_DIRECTORY "${dir}") - set(SDKROOT "${dir}") - ENDIF() - ENDIF() - - IF(NOT SDKROOT) - message(FATAL_ERROR "ERROR: Could not find Mac OSX SDK 10.8 or 10.9") - ELSE() - message(STATUS "Found Mac OSX SDK: ${SDKROOT}") - ENDIF() - - set(CMAKE_CXX_FLAGS "-std=c++11 -stdlib=libc++ -isysroot ${SDKROOT}") - set(CMAKE_C_FLAGS "-isysroot ${SDKROOT}") + set(CMAKE_CXX_FLAGS "-std=c++11 -stdlib=libc++") ELSE() set(CMAKE_CXX_FLAGS "-std=gnu++0x") ENDIF() @@ -36,13 +19,11 @@ IF(APPLE) ${CMAKE_CURRENT_SOURCE_DIR}/../Externals/libetpan/include /usr/include/tidy /usr/include/libxml2 - ${SDKROOT}/usr/include - ${SDKROOT}/usr/include/tidy - ${SDKROOT}/usr/include/libxml2 ) set(additional_lib_searchpath ${CMAKE_CURRENT_SOURCE_DIR}/../Externals/ctemplate/lib + ${CMAKE_CURRENT_SOURCE_DIR}/../Externals/icu4c/lib ${CMAKE_CURRENT_SOURCE_DIR}/../Externals/libetpan/lib ) @@ -73,17 +54,10 @@ find_path(ICU4C_INCLUDE_DIR NAMES unicode/utf8.h PATHS ${additional_includes} ) -if(APPLE) - find_library(ICU4C_LIBRARY - NAMES icucore - PATHS ${additional_lib_searchpath} - ) -else() - find_library(ICU4C_LIBRARY - NAMES icuuc - PATHS ${additional_lib_searchpath} - ) -endif() +find_library(ICU4C_LIBRARY + NAMES icuuc + PATHS ${additional_lib_searchpath} +) if(NOT ICU4C_INCLUDE_DIR OR NOT ICU4C_LIBRARY) message(FATAL_ERROR "ERROR: Could not find icu4c") |