Skip to content

Commit af57ab6

Browse files
committed
fix target cmake discovery
1 parent ed025b7 commit af57ab6

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

buildster/buildster.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -2450,7 +2450,7 @@ def build(self, owner, variant):
24502450
temp = "."
24512451
if not (self.subpath == None):
24522452
temp = self.subpath.getContent()
2453-
if not (os.path.join(self.getPath(owner, variant, None), temp, "CMakeLists.txt").replace("\\", "/") in files):
2453+
if not (os.path.realpath(os.path.join(self.getPath(owner, None, None), temp, "CMakeLists.txt")).replace("\\", "/") in files):
24542454
descriptor = open(os.path.join(path, "CMakeLists.txt"), "w")
24552455
base = path
24562456
write(descriptor, "cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR)")
@@ -2800,7 +2800,7 @@ def buildVariant(self, owner, generator, architecture, arguments, path, installa
28002800
temp = "."
28012801
if not (self.subpath == None):
28022802
temp = self.subpath.getContent()
2803-
if not (os.path.join(self.getPath(owner, variant, None), temp, "CMakeLists.txt").replace("\\", "/") in files):
2803+
if not (os.path.realpath(os.path.join(self.getPath(owner, None, None), temp, "CMakeLists.txt")).replace("\\", "/") in files):
28042804
result = cmake_configure(generator, architecture, arguments+["-DCMAKE_BUILD_TYPE="+variant], path, os.path.join(path, "build").replace("\\", "/"), installation, None)
28052805
else:
28062806
result = cmake_configure(generator, architecture, arguments+["-DCMAKE_BUILD_TYPE="+variant], os.path.join(path, self.subpath.getContent()), os.path.join(path, "build").replace("\\", "/"), installation, None)
@@ -2892,7 +2892,7 @@ def getFiles(self, owner, pattern = None):
28922892
continue
28932893
if not (match.group() == name):
28942894
continue
2895-
result.append(os.path.join(root, name).replace("\\", "/"))
2895+
result.append(os.path.realpath(os.path.join(root, name)).replace("\\", "/"))
28962896
return result
28972897

28982898
def getIncludes(self, owner):

0 commit comments

Comments
 (0)