diff options
| author | xip <[email protected]> | 2022-04-24 00:59:26 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-04-24 00:59:26 +0800 |
| commit | 0ff4f8f4a751300113204c48cda95bb3fd38409f (patch) | |
| tree | 8156eeec1acda49a24681002447a43b6114d3bc9 | |
| parent | db869ffcdefc0fcbc97e9cea61ac21718ae4e2d4 (diff) | |
fix cmake find_package conflit
| -rw-r--r-- | xmake/modules/package/manager/cmake/find_package.lua | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/xmake/modules/package/manager/cmake/find_package.lua b/xmake/modules/package/manager/cmake/find_package.lua index 134b14c3e..28a88c8bf 100644 --- a/xmake/modules/package/manager/cmake/find_package.lua +++ b/xmake/modules/package/manager/cmake/find_package.lua @@ -72,17 +72,17 @@ function _find_package(cmake, name, opt) end cmakefile:print("find_package(%s REQUIRED)", requirestr) cmakefile:print("if(%s_FOUND)", name) - cmakefile:print(" add_executable(%s test.cpp)", name) + cmakefile:print(" add_executable(%s test.cpp)", "test_"..name) cmakefile:print(" target_include_directories(%s PRIVATE ${%s_INCLUDE_DIR} ${%s_INCLUDE_DIRS})", - name, name, name) + "test_"..name, name, name) cmakefile:print(" target_include_directories(%s PRIVATE ${%s_INCLUDE_DIR} ${%s_INCLUDE_DIRS})", - name, name:upper(), name:upper()) + "test_"..name, name:upper(), name:upper()) cmakefile:print(" target_include_directories(%s PRIVATE ${%s_CXX_INCLUDE_DIRS})", - name, name) - cmakefile:print(" target_link_libraries(%s ${%s_LIBRARY} ${%s_LIBRARIES} ${%s_LIBS})", - name, name, name, name) - cmakefile:print(" target_link_libraries(%s ${%s_LIBRARY} ${%s_LIBRARIES} ${%s_LIBS})", - name, name:upper(), name:upper(), name:upper()) + "test_"..name, name) + cmakefile:print(" target_link_libraries(%s %s ${%s_LIBRARY} ${%s_LIBRARIES} ${%s_LIBS})", + "test_"..name, name, name, name, name) + cmakefile:print(" target_link_libraries(%s %s ${%s_LIBRARY} ${%s_LIBRARIES} ${%s_LIBS})", + "test_"..name, name:upper(), name:upper(), name:upper(), name:upper()) cmakefile:print("endif(%s_FOUND)", name) cmakefile:close() @@ -97,7 +97,7 @@ function _find_package(cmake, name, opt) local defines local includedirs local ldflags - local flagsfile = path.join(workdir, "CMakeFiles", name .. ".dir", "flags.make") + local flagsfile = path.join(workdir, "CMakeFiles", "test_"..name .. ".dir", "flags.make") if os.isfile(flagsfile) then local flagsdata = io.readfile(flagsfile) if flagsdata then @@ -137,10 +137,11 @@ function _find_package(cmake, name, opt) end -- parse links and linkdirs for macosx/linux - local linkfile = path.join(workdir, "CMakeFiles", name .. ".dir", "link.txt") + local linkfile = path.join(workdir, "CMakeFiles", "test_"..name .. ".dir", "link.txt") if os.isfile(linkfile) then local linkdata = io.readfile(linkfile) if linkdata then + print(flagsdata) if option.get("diagnosis") then vprint(linkdata) end @@ -188,7 +189,7 @@ function _find_package(cmake, name, opt) end -- pares includedirs and links/linkdirs for windows - local vcprojfile = path.join(workdir, name .. ".vcxproj") + local vcprojfile = path.join(workdir, "test_"..name .. ".vcxproj") if os.isfile(vcprojfile) then local vcprojdata = io.readfile(vcprojfile) if vcprojdata then |
