From 258c8a30d708351c8a48f4f1540ac2a4887f62b7 Mon Sep 17 00:00:00 2001 From: Scott Graves Date: Thu, 16 Mar 2017 20:16:17 -0500 Subject: [PATCH] CMake --- CMakeLists.txt | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index adfebd4..0632a11 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -79,13 +79,22 @@ file(GLOB_RECURSE SIADRIVE_SOURCES add_executable(siadrive WIN32 ${SIADRIVE_SOURCES}) add_dependencies(siadrive siadrive.api siadrive.dokan.api) -target_include_directories(siadrive PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR}/include/siadrive - ${CMAKE_CURRENT_SOURCE_DIR}/3rd-party/CEF_3.2987.1594_g92fba9c - ) -target_link_libraries(siadrive PUBLIC siadrive.api siadrive.dokan.api - ${CMAKE_CURRENT_SOURCE_DIR}/3rd-party/CEF_3.2987.1594_g92fba9c/${CMAKE_BUILD_TYPE}/libcef.lib) - +target_include_directories(siadrive PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include/siadrive) +target_link_libraries(siadrive PRIVATE siadrive.api siadrive.dokan.api) +if (MSVC OR MINGW) + target_include_directories(siadrive PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/3rd-party/CEF/chromium_git/cef) + target_link_libraries(siadrive PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/3rd-party/CEF/chromium_git/chromium/src/out/${CMAKE_BUILD_TYPE}_GN_x64/libcef.dll.lib + ${CMAKE_CURRENT_SOURCE_DIR}/3rd-party/CEF/chromium_git/chromium/src/out/${CMAKE_BUILD_TYPE}_GN_x64/obj/cef/libcef_dll_wrapper.lib + ${CMAKE_CURRENT_SOURCE_DIR}/3rd-party/CEF/chromium_git/chromium/src/out/${CMAKE_BUILD_TYPE}_GN_x64/obj/cef/cef_sandbox.lib) + + if(CMAKE_BUILD_TYPE STREQUAL "Debug") + set_target_properties(siadrive PROPERTIES COMPILE_FLAGS "/MTd") + else() + set_target_properties(siadrive PROPERTIES COMPILE_FLAGS "/MT") + endif() +endif() + #Common Configuration Post-setup include_directories(${3RD_PARTY_INCLUDES} ${COMMON_INCLUDES}) \ No newline at end of file