修复Windows编译问题
This commit is contained in:
@ -157,11 +157,11 @@ async function main() {
|
||||
], (root) => [
|
||||
`set(MNN_INCLUDE_DIR ${JSON.stringify(P(path.join(root, "include")))})`,
|
||||
`set(MNN_LIB_DIR ${JSON.stringify(P(path.join(root, "lib")))})`,
|
||||
`if(WIN32)`
|
||||
` set(MNN_LIBS \${MNN_LIB_DIRMNN}/MNN.lib)`,
|
||||
`else()`
|
||||
` set(MNN_LIBS \${MNN_LIB_DIRMNN}/libMNN.a)`,
|
||||
`endif()`
|
||||
`if(WIN32)`,
|
||||
` set(MNN_LIBS \${MNN_LIB_DIR}/MNN.lib)`,
|
||||
`else()`,
|
||||
` set(MNN_LIBS \${MNN_LIB_DIR}/libMNN.a)`,
|
||||
`endif()`,
|
||||
].join("\n"));
|
||||
//OpenCV
|
||||
if (buildOptions.withOpenCV) cmakeBuildFromSource("OpenCV", "https://github.com/opencv/opencv.git", "4.11.0", null, [
|
||||
@ -180,12 +180,12 @@ async function main() {
|
||||
], (root) => [
|
||||
`set(OpenCV_STATIC ON)`,
|
||||
os.platform() == "win32" ?
|
||||
`include(${JSON.stringify(path.join(root, "OpenCVConfig.cmake"))})` :
|
||||
`include(${JSON.stringify(path.join(root, "lib/cmake/opencv4/OpenCVConfig.cmake"))})`,
|
||||
`include(${JSON.stringify(P(path.join(root, "OpenCVConfig.cmake")))})` :
|
||||
`include(${JSON.stringify(P(path.join(root, "lib/cmake/opencv4/OpenCVConfig.cmake")))})`,
|
||||
`set(OpenCV_INCLUDE_DIR \${OpenCV_INCLUDE_DIRS})`,
|
||||
os.platform() == "win32" ?
|
||||
"set(OpenCV_LIB_DIR ${OpenCV_LIB_PATH})" :
|
||||
`set(OpenCV_LIB_DIR ${JSON.stringify(path.join(root, "lib"))})`,
|
||||
`set(OpenCV_LIB_DIR ${JSON.stringify(P(path.join(root, "lib")))})`,
|
||||
// `set(OpenCV_LIBS OpenCV_LIBS)`,
|
||||
].join("\n"))
|
||||
//ONNXRuntime
|
||||
|
Reference in New Issue
Block a user