Media
/
compute-runtime
mirror of https://github.com/intel/compute-runtime.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

don't enforce igc version from CMakeLists.txt 

moving this requirement to .spec file. CMake should try building with
any IGC version installed in system. More strict requirement should be
defined at package level.

Change-Id: Ieae656fa0eac4069ee8870a829fe116e66ee5ced
Signed-off-by: Artur Harasimiuk <artur.harasimiuk@intel.com>
This commit is contained in:
Artur Harasimiuk 2018-07-07 10:16:54 +02:00
parent 1323880cf8
commit e8424f242b
3 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -203,7 +203,7 @@ if(NOT IGC__IGC_TARGETS)
if(IS_DIRECTORY "${IGC_DIR}/lib/pkgconfig/")
set(ENV{PKG_CONFIG_PATH} "${IGC_DIR}/lib/pkgconfig/")
endif()
pkg_check_modules(IGDRCL__IGC igc-opencl>=18.26.612)
pkg_check_modules(IGDRCL__IGC igc-opencl)
if(IS_DIRECTORY "${IGC_DIR}/lib/pkgconfig/")
unset(ENV{PKG_CONFIG_PATH})
set(IGDRCL__IGC_LIBRARY_PATH "${IGC_DIR}/lib/")

11
scripts/build_spec.py
View File

@ -51,13 +51,6 @@ gmmlib_revision = manifest['components']['gmmlib']['revision']
c = repo.commit(neo_revision)
cd = datetime.datetime.fromtimestamp(c.committed_date)
with open("CMakeLists.txt", "r") as f:
for line in f.readlines():
m = re.match("^(pkg_check_modules)(\s*\(\s*)(\S+)\s+(\S+[^>\s])(>?=)([^=\s]\S+)(\s*\)\s*)$", line.strip())
if not m is None:
if m.groups()[3] == 'igc-opencl':
igc_revision = m.groups()[5]
pkg_version = "%s.%s.%s" %(str(cd.isocalendar()[0])[-2:], cd.isocalendar()[1], sys.argv[3])
with open(sys.argv[2], 'r') as f:
@ -78,9 +71,5 @@ with open(sys.argv[2], 'r') as f:
print "%s" % (line.rstrip().replace("__NEO_PACKAGE_RELEASE__", "%s" % sys.argv[4]))
continue
if not re.match(".*__IGC_VERSION_REQUIRED__$", line.strip()) is None:
print "%s" % (line.rstrip().replace("__IGC_VERSION_REQUIRED__", "%s" % igc_revision))
continue
print line.rstrip()

5
scripts/fedora.spec.in
View File

@ -1,5 +1,6 @@
%global neo_commit_id __NEO_COMMIT_ID__
%global gmmlib_commit_id __GMMLIB_COMMIT_ID__
%global igc_version_required 18.26.612
Name: intel-opencl
Version: __NEO_PACKAGE_VERSION__
@ -20,8 +21,8 @@ BuildRequires: gcc-c++ ninja-build make procps python2 libva-devel
BuildRequires: cmake clang gcc-c++ ninja-build make procps python2 sed libva-devel
%endif
BuildRequires: intel-igc-opencl-devel >= __IGC_VERSION_REQUIRED__
Requires: intel-igc-opencl >= __IGC_VERSION_REQUIRED__
BuildRequires: intel-igc-opencl-devel >= %{igc_version_required}
Requires: intel-igc-opencl >= %{igc_version_required}
%description