Skip to content

Commit

Permalink
[Makefile.win] fix windows
Browse files Browse the repository at this point in the history
  • Loading branch information
cocoa-xu committed Feb 16, 2024
1 parent 224b7fd commit a87edee
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Makefile.win
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ C_SRC_HEADER_TXT="$(C_SRC)/headers.txt"
HEADERS_TXT="$(CMAKE_OPENCV_BUILD_DIR)/modules/python_bindings_generator/headers.txt"
!ENDIF

!IFDEF
!IFDEF CMAKE_TOOLCHAIN_FILE
CMAKE_WIN_FINAL_OPTIONS_DEFINITIVE_EDITION_V2 = -G "$(CMAKE_GENERATOR_TYPE)" -A "$(MSBUILD_PLATFORM)" $(CMAKE_WIN_FINAL_OPTIONS_DEFINITIVE_EDITION) -D CMAKE_TOOLCHAIN_FILE="$(CMAKE_TOOLCHAIN_FILE)"
!ELSE
CMAKE_WIN_FINAL_OPTIONS_DEFINITIVE_EDITION_V2 = -G "$(CMAKE_GENERATOR_TYPE)" $(CMAKE_WIN_FINAL_OPTIONS_DEFINITIVE_EDITION)
Expand Down Expand Up @@ -206,6 +206,6 @@ $(EVISION_SO): opencv
-D EVISION_ENABLE_CONTRIB="$(EVISION_ENABLE_CONTRIB)" \
$(CMAKE_CONFIGURE_FLAGS) "$(MAKEDIR)" && \
cmake --build . $(CMAKE_BUILD_PARAMETER) && \
cmake --install . --config "$(CMAKE_BUILD_TYPE) \
cmake --install . --config "$(CMAKE_BUILD_TYPE)" \
)
!ENDIF

0 comments on commit a87edee

Please sign in to comment.