diff options
| author | ruki <[email protected]> | 2022-04-24 07:41:58 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-04-24 07:41:58 +0800 |
| commit | 9b092d482a154622e212c012082863fa9c1db1a3 (patch) | |
| tree | 70fb903e44c8ed637c6485146da8c9069afa72b0 | |
| parent | e6719882531a836578690a1f64664316ae866ff1 (diff) | |
Update find_package.lua
| -rw-r--r-- | xmake/modules/package/manager/cmake/find_package.lua | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/xmake/modules/package/manager/cmake/find_package.lua b/xmake/modules/package/manager/cmake/find_package.lua index 3e540e041..8a365391a 100644 --- a/xmake/modules/package/manager/cmake/find_package.lua +++ b/xmake/modules/package/manager/cmake/find_package.lua @@ -71,19 +71,20 @@ function _find_package(cmake, name, opt) end end end + local testname = "test_" .. name cmakefile:print("find_package(%s REQUIRED)", requirestr) cmakefile:print("if(%s_FOUND)", name) - cmakefile:print(" add_executable(%s test.cpp)", "test_" .. name) + cmakefile:print(" add_executable(%s test.cpp)", testname) cmakefile:print(" target_include_directories(%s PRIVATE ${%s_INCLUDE_DIR} ${%s_INCLUDE_DIRS})", - "test_" .. name, name, name) + testname, name, name) cmakefile:print(" target_include_directories(%s PRIVATE ${%s_INCLUDE_DIR} ${%s_INCLUDE_DIRS})", - "test_" .. name, name:upper(), name:upper()) + testname, name:upper(), name:upper()) cmakefile:print(" target_include_directories(%s PRIVATE ${%s_CXX_INCLUDE_DIRS})", - "test_" .. name, name) + testname, name) cmakefile:print(" target_link_libraries(%s %s ${%s_LIBRARY} ${%s_LIBRARIES} ${%s_LIBS})", - "test_" .. name, name, name, name, name) + testname, 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()) + testname, name:upper(), name:upper(), name:upper(), name:upper()) cmakefile:print("endif(%s_FOUND)", name) cmakefile:close() @@ -98,7 +99,7 @@ function _find_package(cmake, name, opt) local defines local includedirs local ldflags - local flagsfile = path.join(workdir, "CMakeFiles", "test_" .. name .. ".dir", "flags.make") + local flagsfile = path.join(workdir, "CMakeFiles", testname .. ".dir", "flags.make") if os.isfile(flagsfile) then local flagsdata = io.readfile(flagsfile) if flagsdata then @@ -138,7 +139,7 @@ function _find_package(cmake, name, opt) end -- parse links and linkdirs for macosx/linux - local linkfile = path.join(workdir, "CMakeFiles", "test_" .. name .. ".dir", "link.txt") + local linkfile = path.join(workdir, "CMakeFiles", testname .. ".dir", "link.txt") if os.isfile(linkfile) then local linkdata = io.readfile(linkfile) if linkdata then @@ -190,7 +191,7 @@ function _find_package(cmake, name, opt) end -- pares includedirs and links/linkdirs for windows - local vcprojfile = path.join(workdir, "test_" .. name .. ".vcxproj") + local vcprojfile = path.join(workdir, testname .. ".vcxproj") if os.isfile(vcprojfile) then local vcprojdata = io.readfile(vcprojfile) if vcprojdata then |
