From 082458d8c89faa1325fafd0dc29e70db90405ac6 Mon Sep 17 00:00:00 2001 From: Dan Smith Date: Tue, 4 Apr 2023 17:28:41 -0400 Subject: [PATCH] WCRIPT change from 'main' to fix CSM build --- .../c++/nitf/tests/test_ref_counts.cpp | 0 six/projects/csm/external/wscript | 23 +++++-------------- 2 files changed, 6 insertions(+), 17 deletions(-) mode change 100755 => 100644 externals/nitro/modules/c++/nitf/tests/test_ref_counts.cpp diff --git a/externals/nitro/modules/c++/nitf/tests/test_ref_counts.cpp b/externals/nitro/modules/c++/nitf/tests/test_ref_counts.cpp old mode 100755 new mode 100644 diff --git a/six/projects/csm/external/wscript b/six/projects/csm/external/wscript index 9424100b6b..1866b3ca12 100644 --- a/six/projects/csm/external/wscript +++ b/six/projects/csm/external/wscript @@ -56,24 +56,13 @@ def build(bld): # dependency, we could recompile in the CSM source code that we # need to use. vtsDir = 'vts_301_0' - six_root = '../../../../../..' - nested_six_root = six_root + '/../..' - install = six_root + '/install' - nested_install = nested_six_root + '/install' - coda_oss = six_root + '/externals/coda-oss/modules/c++' - nested_coda_oss = nested_six_root + '/externals/coda-oss/modules/c++' bld.program(target='vts', name='vts', - includes=['include', - install + '/include', nested_install + '/include', - coda_oss + '/sys/include', coda_oss + '/str/include', coda_oss + '/std/include', - coda_oss + '/coda_oss/include', coda_oss + '/gsl/include', coda_oss + '/except/include', - nested_coda_oss + '/sys/include', nested_coda_oss + '/str/include', nested_coda_oss + '/std/include', - nested_coda_oss + '/coda_oss/include', nested_coda_oss + '/gsl/include', nested_coda_oss + '/except/include' - ], - source=bld.path.find_dir(os.path.join(vtsDir, 'source')).ant_glob('*.cpp'), - use='sys-c++ CSMAPI THREAD DL', - path=bld.path.find_dir(vtsDir), - install_path=bld.env['install_bindir']) + module_deps=['sys', 'str', 'std', 'coda_oss', 'gsl', 'except'], + includes=['include'], + source=bld.path.find_dir(os.path.join(vtsDir, 'source')).ant_glob('*.cpp'), + use='sys-c++ std-c++ CSMAPI THREAD DL', + path=bld.path.find_dir(vtsDir), + install_path=bld.env['install_bindir']) def distclean(context): # remove the unzipped directory