diff options
| author | LogicParrot <LogicParrot@users.noreply.github.com> | 2017-08-30 16:42:58 +0200 |
|---|---|---|
| committer | LogicParrot <LogicParrot@users.noreply.github.com> | 2017-08-30 16:42:58 +0200 |
| commit | f0d14229706eca615198c888bd8d3b95b663cfb4 (patch) | |
| tree | dfcb7fb092091b69a80b3b362adf862f80ba1ba0 /CMakeLists.txt | |
| parent | Initial zombies (diff) | |
| parent | Merge pull request #3969 from peterbell10/cuboid (diff) | |
| download | cuberite-f0d14229706eca615198c888bd8d3b95b663cfb4.tar cuberite-f0d14229706eca615198c888bd8d3b95b663cfb4.tar.gz cuberite-f0d14229706eca615198c888bd8d3b95b663cfb4.tar.bz2 cuberite-f0d14229706eca615198c888bd8d3b95b663cfb4.tar.lz cuberite-f0d14229706eca615198c888bd8d3b95b663cfb4.tar.xz cuberite-f0d14229706eca615198c888bd8d3b95b663cfb4.tar.zst cuberite-f0d14229706eca615198c888bd8d3b95b663cfb4.zip | |
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b92ca8e8..2e3c51854 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -# This is the top-level CMakeLists.txt file for the Cuberite project +# This is the top-level CMakeLists.txt file for the Cuberite project # # Use CMake to generate the build files for your platform # @@ -209,8 +209,8 @@ link_directories(lib/jsoncpp/src/lib_json) if (NOT EXISTS ${PROJECT_SOURCE_DIR}/lib/SQLiteCpp/CMakeLists.txt) message(FATAL_ERROR "SQLiteCpp is missing in folder lib/SQLiteCpp. Have you initialized the submodules / downloaded the extra libraries?") endif() -if (NOT EXISTS ${PROJECT_SOURCE_DIR}/lib/polarssl/CMakeLists.txt) - message(FATAL_ERROR "PolarSSL is missing in folder lib/polarssl. Have you initialized the submodules / downloaded the extra libraries?") +if (NOT EXISTS ${PROJECT_SOURCE_DIR}/lib/mbedtls/CMakeLists.txt) + message(FATAL_ERROR "mbedTLS is missing in folder lib/mbedtls. Have you initialized the submodules / downloaded the extra libraries?") endif() if (NOT EXISTS ${PROJECT_SOURCE_DIR}/lib/libevent/CMakeLists.txt) message(FATAL_ERROR "LibEvent is missing in folder lib/libevent. Have you initialized and updated the submodules / downloaded the extra libraries?") @@ -274,13 +274,13 @@ if (WIN32) endif() # We use EXCLUDE_FROM_ALL so that only the explicit dependencies are used -# (PolarSSL also has test and example programs in their CMakeLists.txt, we don't want those) -include(lib/polarssl.cmake EXCLUDE_FROM_ALL) +# (mbedTLS also has test and example programs in their CMakeLists.txt, we don't want those) +include(lib/mbedtls.cmake EXCLUDE_FROM_ALL) if(NOT MSVC AND "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "arm") - # mbed TLS uses the frame pointer's register in inline assembly: + # mbed TLS uses the frame pointer's register in inline assembly for its bignum implementation: # https://tls.mbed.org/kb/development/arm-thumb-error-r7-cannot-be-used-in-asm-here - target_compile_options(mbedtls PUBLIC -fomit-frame-pointer) + target_compile_options(mbedcrypto PRIVATE -fomit-frame-pointer) endif() set_exe_flags() @@ -302,7 +302,9 @@ if (MSVC) jsoncpp_lib_static lua luaexpat + mbedcrypto mbedtls + mbedx509 sqlite SQLiteCpp tolualib |