1
0

CEF changes

This commit is contained in:
Scott E. Graves
2017-03-17 22:25:11 -05:00
parent 736cbce819
commit 1f2efbc761
5 changed files with 34 additions and 8 deletions

View File

@@ -67,7 +67,7 @@ if (MSVC OR MINGW)
target_include_directories(siadrive.dokan.api PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/Dokan\ Library-1.0.2/include/dokan
${CMAKE_CURRENT_SOURCE_DIR}/include/siadrive_dokan_api)
target_link_libraries(siadrive.dokan.api siadrive.api ${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/Dokan\ Library-1.0.2/lib/dokan1.lib)
target_link_libraries(siadrive.dokan.api siadrive.api ${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/Dokan\ Library-1.0.2/lib/dokan1.lib)
endif()
@@ -93,9 +93,34 @@ if (MSVC OR MINGW)
set_target_properties(siadrive PROPERTIES COMPILE_FLAGS "/MTd")
else()
set_target_properties(siadrive PROPERTIES COMPILE_FLAGS "/MT")
endif()
endif()
endif()
if (MSVC)
set(CEF_LIBS
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/chromium/src/out/${CMAKE_BUILD_TYPE}_GN_x64/libcef.dll
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/chromium/src/out/${CMAKE_BUILD_TYPE}_GN_x64/chrome_elf.dll
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/chromium/src/out/${CMAKE_BUILD_TYPE}_GN_x64/libEGL.dll
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/chromium/src/out/${CMAKE_BUILD_TYPE}_GN_x64/libGLESv2.dll)
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
set(CEF_LIBS ${CEF_LIBS}
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/chromium/src/out/${CMAKE_BUILD_TYPE}_GN_x64/libcef.dll.pdb
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/chromium/src/out/${CMAKE_BUILD_TYPE}_GN_x64/chrome_elf.dll.pdb
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/chromium/src/out/${CMAKE_BUILD_TYPE}_GN_x64/libEGL.dll.pdb
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/chromium/src/out/${CMAKE_BUILD_TYPE}_GN_x64/libGLESv2.dll.pdb
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/chromium/src/out/${CMAKE_BUILD_TYPE}_GN_x64/obj/cef/libcef_dll_wrapper_cc.pdb)
endif()
endif()
# Windows installation
if (MSVC OR MINGW)
install(FILES ${CEF_LIBS} DESTINATION ${SIADRIVE_INSTALL_FOLDER})
install(TARGETS siadrive.api siadrive.dokan.api LIBRARY DESTINATION ${SIADRIVE_INSTALL_FOLDER})
install(TARGETS siadrive DESTINATION ${SIADRIVE_INSTALL_FOLDER})
endif()
#Common Configuration Post-setup
include_directories(${3RD_PARTY_INCLUDES} ${COMMON_INCLUDES})