fix intel defaults in ci workflows, fix configure_file for non-buildi… · umar456/arrayfire@d596bf7 · GitHub

1. umar456
2. arrayfire

Repository navigation

• Code
• Pull requests
• Actions
• Projects
• Wiki
• Security and quality
• Insights

Commit d596bf7

Browse filesBrowse the repository at this point in the historyBrowse files

syurkevi

authored and

umar456

committed

fix intel defaults in ci workflows, fix configure_file for non-building forge

1 parent 60277cf commit d596bf7
Copy full SHA for d596bf7

2 files changed

+11-6Lines changed: 11 additions & 6 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• .github/workflows
  • release_src_artifact.yml
• CMakeModules
  • AFconfigure_forge_dep.cmake

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎.github/workflows/release_src_artifact.yml‎

Copy file name to clipboardExpand all lines: .github/workflows/release_src_artifact.yml

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -46,7 +46,7 @@ jobs:
46	46	run: |
47	47	cd ${GITHUB_WORKSPACE}/arrayfire-full-${AF_VER}
48	48	mkdir build && cd build
49		- cmake .. -DAF_BUILD_FORGE:BOOL=ON
	49	+ cmake .. -DAF_BUILD_FORGE:BOOL=ON -DAF_COMPUTE_LIBRARY="FFTW/LAPACK/BLAS"
50	50
51	51	- name: Create source tarball
52	52	id: create-src-tarball

Collapse file

‎CMakeModules/AFconfigure_forge_dep.cmake‎

Copy file name to clipboardExpand all lines: CMakeModules/AFconfigure_forge_dep.cmake

+10-5Lines changed: 10 additions & 5 deletions

Original file line number	Diff line number	Diff line change
@@ -61,8 +61,8 @@ if(AF_BUILD_FORGE)
61	61	set_property(TARGET forge APPEND_STRING PROPERTY COMPILE_FLAGS " -w")
62	62	else(AF_BUILD_FORGE)
63	63	find_package(Forge
64		- ${FG_VERSION_MAJOR}.${FG_VERSION_MINOR}.${FG_VERSION_PATCH}
65		- QUIET
	64	+ ${FG_VERSION_MAJOR}.${FG_VERSION_MINOR}.${FG_VERSION_PATCH}
	65	+ QUIET
66	66	)
67	67
68	68	if(TARGET Forge::forge)
@@ -78,9 +78,14 @@ else(AF_BUILD_FORGE)
78	78	COMPONENT common_backend_dependencies)
79	79	endif()
80	80	else()
	81	+ af_dep_check_and_populate(${forge_prefix}
	82	+ URI https://github.com/arrayfire/forge.git
	83	+ REF "v${FG_VERSION}"
	84	+ )
	85	+
81	86	configure_file(
82		- ${${forge_prefix}_SOURCE_DIR}/CMakeModules/version.h.in
83		- ${${forge_prefix}_BINARY_DIR}/include/fg/version.h
84		- )
	87	+ ${${forge_prefix}_SOURCE_DIR}/CMakeModules/version.h.in
	88	+ ${${forge_prefix}_BINARY_DIR}/include/fg/version.h
	89	+ )
85	90	endif()
86	91	endif(AF_BUILD_FORGE)

0 commit comments

Comments

0 (0)