From 5b754c3e9030fac26a37dadec159a3b8506f5593 Mon Sep 17 00:00:00 2001 From: BlackMATov Date: Mon, 8 Jul 2019 09:20:42 +0700 Subject: [PATCH] add curly.hpp submodule --- .gitmodules | 3 +++ CMakeLists.txt | 11 +++++++++++ modules/curly.hpp | 1 + 3 files changed, 15 insertions(+) create mode 160000 modules/curly.hpp diff --git a/.gitmodules b/.gitmodules index 5e187288..717fa46f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -37,3 +37,6 @@ [submodule "modules/variant"] path = modules/variant url = https://github.com/mpark/variant +[submodule "modules/curly.hpp"] + path = modules/curly.hpp + url = https://github.com/BlackMATov/curly.hpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 0fef740e..3d1751b5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -136,6 +136,14 @@ file(GLOB_RECURSE E2D_3RDPARTY # e2d external 3rd party # +if(USE_MSVC_RUNTIME_LIBRARY_DLL) + set(USE_STATIC_CRT OFF CACHE BOOL "" FORCE) +else() + set(USE_STATIC_CRT ON CACHE BOOL "" FORCE) +endif() +add_subdirectory(modules/curly.hpp) +set_target_properties(curly.hpp libcurl PROPERTIES FOLDER modules) + set(GLFW_INSTALL OFF CACHE BOOL "" FORCE) set(GLFW_BUILD_DOCS OFF CACHE BOOL "" FORCE) set(GLFW_BUILD_TESTS OFF CACHE BOOL "" FORCE) @@ -229,6 +237,9 @@ source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${E2D_SOURCES} ${E2D_3RDPARTY}) +target_link_libraries(${PROJECT_NAME} + PUBLIC curly.hpp) + target_link_libraries(${PROJECT_NAME} PRIVATE bass PRIVATE glfw diff --git a/modules/curly.hpp b/modules/curly.hpp new file mode 160000 index 00000000..571fa4d9 --- /dev/null +++ b/modules/curly.hpp @@ -0,0 +1 @@ +Subproject commit 571fa4d9c440d0931830507e390ec2dd5e9e6701