diff options
Diffstat (limited to 'externals')
| -rw-r--r-- | externals/CMakeLists.txt | 16 | ||||
| m--------- | externals/cpr | 0 | ||||
| -rw-r--r-- | externals/cryptopp/CMakeLists.txt | 5 | ||||
| m--------- | externals/enet | 0 | ||||
| m--------- | externals/json | 0 |
5 files changed, 21 insertions, 0 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 02e02350c..ccc7f13b6 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt | |||
| @@ -48,3 +48,19 @@ if (ARCHITECTURE_x86_64) | |||
| 48 | target_include_directories(xbyak INTERFACE ./xbyak/xbyak) | 48 | target_include_directories(xbyak INTERFACE ./xbyak/xbyak) |
| 49 | target_compile_definitions(xbyak INTERFACE XBYAK_NO_OP_NAMES) | 49 | target_compile_definitions(xbyak INTERFACE XBYAK_NO_OP_NAMES) |
| 50 | endif() | 50 | endif() |
| 51 | |||
| 52 | # ENet | ||
| 53 | add_subdirectory(enet) | ||
| 54 | target_include_directories(enet INTERFACE ./enet/include) | ||
| 55 | |||
| 56 | if (ENABLE_WEB_SERVICE) | ||
| 57 | # CPR | ||
| 58 | option(BUILD_TESTING OFF) | ||
| 59 | option(BUILD_CPR_TESTS OFF) | ||
| 60 | add_subdirectory(cpr) | ||
| 61 | target_include_directories(cpr INTERFACE ./cpr/include) | ||
| 62 | |||
| 63 | # JSON | ||
| 64 | add_library(json-headers INTERFACE) | ||
| 65 | target_include_directories(json-headers INTERFACE ./json/src) | ||
| 66 | endif() | ||
diff --git a/externals/cpr b/externals/cpr new file mode 160000 | |||
| Subproject b5758fbc88021437f968fe5174f121b8b92f5d5 | |||
diff --git a/externals/cryptopp/CMakeLists.txt b/externals/cryptopp/CMakeLists.txt index 864de18bb..8a626e44a 100644 --- a/externals/cryptopp/CMakeLists.txt +++ b/externals/cryptopp/CMakeLists.txt | |||
| @@ -44,6 +44,11 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Intel") | |||
| 44 | add_definitions(-wd68 -wd186 -wd279 -wd327 -wd161 -wd3180) | 44 | add_definitions(-wd68 -wd186 -wd279 -wd327 -wd161 -wd3180) |
| 45 | endif() | 45 | endif() |
| 46 | 46 | ||
| 47 | if(MSVC) | ||
| 48 | # Disable C4390: empty controlled statement found: is this the intent? | ||
| 49 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4390") | ||
| 50 | endif() | ||
| 51 | |||
| 47 | # Endianness | 52 | # Endianness |
| 48 | TEST_BIG_ENDIAN(IS_BIG_ENDIAN) | 53 | TEST_BIG_ENDIAN(IS_BIG_ENDIAN) |
| 49 | if(IS_BIG_ENDIAN) | 54 | if(IS_BIG_ENDIAN) |
diff --git a/externals/enet b/externals/enet new file mode 160000 | |||
| Subproject a84c120eff13d2fa3eadb41ef7afe0f7819f4d6 | |||
diff --git a/externals/json b/externals/json new file mode 160000 | |||
| Subproject d3496347fcd1382896fca3aaf78a0d803c2f52e | |||