Skip to content

Commit

Permalink
New pipeline fix
Browse files Browse the repository at this point in the history
  • Loading branch information
NHollmann committed Aug 2, 2020
1 parent 7c9a134 commit e546a8d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ jobs:
cc: "cl", cxx: "cl",
environment_script: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars64.bat"
}
- {
name: "Windows Latest MinGW", artifact: "Dnkvw-Windows-MinGW.zip",
os: windows-latest,
cc: "gcc", cxx: "g++"
}
# - {
# name: "Windows Latest MinGW", artifact: "Dnkvw-Windows-MinGW.zip",
# os: windows-latest,
# cc: "gcc", cxx: "g++"
# }
# - {
# name: "Ubuntu Latest GCC", artifact: "Dnkvw-Linux.zip",
# os: ubuntu-latest,
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@ set_package_properties(OpenCV PROPERTIES
PURPOSE "Required for all image processing and video capturing tasks."
)

if(WIN32)
if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
# Note: Its required that the /MT /MD /MTd /MDd setting is the same for all
# software components in an Windows application.
# Maybe an cmake option for this would be nice.
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MD")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
endif()

# Begin of RPath Helper
Expand Down

0 comments on commit e546a8d

Please sign in to comment.