Skip to content

Commit 43ef4f4

Browse files
committed
Configuration - Update OpenMP library path and adjust library suffixes in MinGW build workflow
1 parent 12992a0 commit 43ef4f4

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

.github/workflows/build-multiconfig-mingw.yml

+1-4
Original file line numberDiff line numberDiff line change
@@ -118,17 +118,14 @@ jobs:
118118
-D USE_GLES2=ON \
119119
-D USE_OPENVR=ON \
120120
-D USE_VTK=ON \
121-
-D VTK_MODULE_ENABLE_VTK_AcceleratorsVTKmCore=NO \
122-
-D VTK_MODULE_ENABLE_VTK_AcceleratorsVTKmDataModel=NO \
123-
-D VTK_MODULE_ENABLE_VTK_AcceleratorsVTKmFilters=NO \
124121
-D USE_TBB=OFF \
125122
-D USE_RAPIDJSON=ON \
126123
-D USE_OPENGL=ON \
127124
-D OpenMP_C_FLAGS="-fopenmp" \
128125
-D OpenMP_CXX_FLAGS="-fopenmp" \
129126
-D OpenMP_C_LIB_NAMES="gomp" \
130127
-D OpenMP_CXX_LIB_NAMES="gomp" \
131-
-D OpenMP_gomp_LIBRARY="/ucrt64/lib/libgomp.dll.a" \
128+
-D OpenMP_gomp_LIBRARY="$MSYSTEM_PREFIX/lib/libgomp.dll.a" \
132129
-D CMAKE_CXX_FLAGS="-Wall -Wextra -fopenmp" \
133130
-D CMAKE_C_FLAGS="-Wall -Wextra -fopenmp" ..
134131

adm/cmake/3rdparty_macro.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_CSF_NAME LIBRARY_NAME
121121
# if (BUILD_SHARED_LIBS)
122122
# library
123123
if (NOT 3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}}")
124-
set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .so .dylib .a)
124+
set (CMAKE_FIND_LIBRARY_SUFFIXES .dll.a .lib .so .dylib .a)
125125

126126
set (${PRODUCT_NAME}_PATH_SUFFIXES lib)
127127
if (WIN32)

0 commit comments

Comments
 (0)