Merge branch 'master' into develop

netease-kit · Oct 14, 2024 · 925b75c · 925b75c
2 parents 02bf121 + 7f2ec7a
commit 925b75c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -101,6 +101,6 @@ add_subdirectory(nim_win_demo)
 add_subdirectory(tool_kits/uninstall)
 add_subdirectory(tool_kits/install)
 
-add_dependencies(nim_demo cef_render uninstall)
+add_dependencies(nim_demo render uninstall)
 
 set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT nim_demo)
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -44,8 +44,7 @@
             "description": "Conan v2 with CMake example for Windows - Release Configuration",
             "binaryDir": "${sourceDir}/build",
             "cacheVariables": {
-                "CMAKE_BUILD_TYPE": "Release",
-                "CMAKE_INSTALL_PREFIX": "${sourceDir}/win32-release"
+                "CMAKE_BUILD_TYPE": "Release"
             }
         }
     ],

diff --git a/tool_kits/cef/cef_render/CMakeLists.txt b/tool_kits/cef/cef_render/CMakeLists.txt
@@ -26,12 +26,8 @@ TARGET_LINK_LIBRARIES(${TARGET_NAME}
     libcef_dll_wrapper
     cef_module
     ${THIRD_PARTY_LIBS}
+    ${CONAN_LIBS_LIBCEF}
 )
-IF (CMAKE_BUILD_TYPE MATCHES "Release")
-    TARGET_LINK_LIBRARIES(${TARGET_NAME} nim_libcef)
-ELSE ()
-    TARGET_LINK_LIBRARIES(${TARGET_NAME} nim_libcef_d)
-ENDIF ()
 
 SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES
     FOLDER ${GROUP_UI_COMPONENTS}