Skip to content

build(-system) fixes#22527

Merged
opencv-pushbot merged 2 commits intoopencv:4.xfrom
paroj:misc
Oct 16, 2022
Merged

build(-system) fixes#22527
opencv-pushbot merged 2 commits intoopencv:4.xfrom
paroj:misc

Conversation

@paroj
Copy link
Copy Markdown
Contributor

@paroj paroj commented Sep 17, 2022 •
edited by alalek
Loading

Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

  • I agree to contribute to the project under Apache 2 License.
  • To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
  • The PR is proposed to the proper branch
  • There is a reference to the original bug report and related work
  • There is accuracy test, performance test and test data in opencv_extra repository, if applicable
    Patch to opencv_extra has the same branch name.
  • The feature is well documented and sample code can be built with the project CMake
force_builders=Win64
build_image:Custom Win=msvs2019
allow_multiple_commits=1

@paroj paroj changed the title Misc build(-system) fixes Sep 17, 2022
@asmorkalov asmorkalov requested a review from alalek September 17, 2022 13:11
alalek
alalek reviewed Sep 17, 2022
View reviewed changes
@paroj paroj force-pushed the misc branch 2 times, most recently from 24913f1 to f842f06 Compare September 29, 2022 14:17
@asmorkalov asmorkalov requested a review from alalek October 4, 2022 05:33
@alalek
Copy link
Copy Markdown
Member

alalek commented Oct 4, 2022 •
edited
Loading

There are linker failures from MSVS 2015 configuration (1 2 3):

test_intrin128.sse2.obj : error LNK2005: "void __cdecl opencv_test::hal::intrin128::cpu_baseline::test_hal_intrin_float16(void)" (?test_hal_intrin_float16@cpu_baseline@intrin128@hal@opencv_test@@YAXXZ) already defined in test_intrin.obj [C:\build\precommit_windows64\build\modules\core\opencv_test_core.vcxproj]
test_intrin128.sse2.obj : error LNK2005: "void __cdecl opencv_test::hal::intrin128::cpu_baseline::test_hal_intrin_float32(void)" (?test_hal_intrin_float32@cpu_baseline@intrin128@hal@opencv_test@@YAXXZ) already defined in test_intrin.obj [C:\build\precommit_windows64\build\modules\core\opencv_test_core.vcxproj]
...

Update: Build with MSVS 2017 looks good.

Update 2: Build with MSVS 2019 are broken too.

@paroj
Copy link
Copy Markdown
Contributor Author

paroj commented Oct 4, 2022 •
edited
Loading

it seems the PCH change unmasks some structural issues regarding the tests.

I would suggest to just revert to the old PCH code for MSVC, as I lack the insight to fix the tests right now.

@alalek alalek mentioned this pull request Oct 5, 2022
Merged
@alalek
Copy link
Copy Markdown
Member

alalek commented Oct 5, 2022

Looks like in this case compilation with PCH ignores some compilation flags (PCH file can't handle multiple sets of them).
I prepared a fix here: #22600 (to 3.4 branch, so need to wait for "Merge 3.4")
Please drop the last commit with "inline" changes.

Patch is validated here: https://pullrequest.opencv.org/buildbot/builders/precommit_windows64/builds/100140

alalek
alalek approved these changes Oct 16, 2022
View reviewed changes
Copy link
Copy Markdown
Member

@alalek alalek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you 👍

@opencv-pushbot opencv-pushbot merged commit 584ea43 into opencv:4.x Oct 16, 2022
@paroj paroj deleted the misc branch October 16, 2022 21:21
@alalek alalek mentioned this pull request Jan 8, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@alalek alalek alalek approved these changes

Assignees

@alalek alalek

Labels

category: build/install

Projects

None yet

Milestone

4.7.0

Development

Successfully merging this pull request may close these issues.

4 participants

@paroj @alalek @opencv-pushbot @asmorkalov