Skip to content

Commit 0492f87

Browse files
committed
Fix build issues related to 'missing' version.cpp
Change-Id: Id44de09b8ed27edb98c53f73ca0d0ce05d4cc7ec
1 parent 0ae7eae commit 0492f87

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

wscript

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ REQUIRED_BOOST_LIBS = ['graph', 'thread', 'unit_test_framework',
1010
'system', 'random', 'date_time', 'iostreams', 'regex',
1111
'program_options', 'chrono', 'filesystem']
1212

13+
top = '../..'
14+
1315
def required_boost_libs(conf):
1416
conf.env.REQUIRED_BOOST_LIBS += REQUIRED_BOOST_LIBS
1517

@@ -87,13 +89,20 @@ def build(bld):
8789

8890
bld(features="subst",
8991
name="versioncpp-NFD",
90-
source='NFD/core/version.cpp.in', target='NFD/core/version.cpp',
92+
source='NFD/core/version.cpp.in', target=bld.path.find_or_declare('NFD/core/version.cpp'),
9193
install_path=None,
9294
VERSION_STRING=base,
9395
VERSION_BUILD="%s-ndnSIM" % build,
9496
VERSION=int(split[0]) * 1000000 + int(split[1]) * 1000 + int(split[2]),
9597
VERSION_MAJOR=split[0], VERSION_MINOR=split[1], VERSION_PATCH=split[2])
9698

99+
bld.objects(
100+
features="cxx",
101+
target='version-NFD-objects',
102+
source='NFD/core/version.cpp',
103+
includes='../../ns3/ndnSIM/NFD',
104+
use='version-NFD versioncpp-NFD')
105+
97106
(base, build, split) = bld.getVersion('ndn-cxx')
98107
bld(features="subst",
99108
name="version-ndn-cxx",
@@ -104,12 +113,6 @@ def build(bld):
104113
VERSION=int(split[0]) * 1000000 + int(split[1]) * 1000 + int(split[2]),
105114
VERSION_MAJOR=split[0], VERSION_MINOR=split[1], VERSION_PATCH=split[2])
106115

107-
bld.objects(
108-
target='version-NFD-objects',
109-
source='NFD/core/version.cpp',
110-
includes='../../ns3/ndnSIM/NFD',
111-
use='version-NFD versioncpp-NFD')
112-
113116
deps = ['core', 'network', 'point-to-point', 'topology-read', 'mobility', 'internet']
114117
if 'ns3-visualizer' in bld.env['NS3_ENABLED_MODULES']:
115118
deps.append('visualizer')

0 commit comments

Comments
 (0)