Skip to content

Commit d00f1af

Browse files
authored
MSVCのarchオプションを指定できるよう変更
1 parent cab30aa commit d00f1af

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

src/CMakeLists.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,13 @@ add_library(${PROJECT_NAME} SHARED)
99

1010
set(OPENCV_INCLUDE_DIR CACHE PATH "OpenCV include directory")
1111
set(OPENCV_LIBRARY_DIR CACHE PATH "OpenCV library directory")
12+
if(NOT MSVC_ARCH)
13+
set(MSVC_ARCH "AVX")
14+
endif()
1215

16+
message("-- OPTIONS --")
17+
message("-- MSVC_ARCH: ${MSVC_ARCH}")
18+
message("-------------")
1319

1420
target_sources(${PROJECT_NAME} PRIVATE main.cpp main.def bgs.cpp hsv.cpp resource.rc)
1521
set_target_properties(${PROJECT_NAME} PROPERTIES SUFFIX ".auf")
@@ -23,7 +29,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE comctl32 ippicvmt
2329
if("${CMAKE_CXX_COMPILER_ID}" MATCHES "MSVC")
2430
set_property(TARGET ${PROJECT_NAME} PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
2531
set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "/LARGEADDRESSAWARE")
26-
target_compile_options(${PROJECT_NAME} PRIVATE /arch:AVX /source-charset:utf-8 /execution-charset:shift_jis)
32+
target_compile_options(${PROJECT_NAME} PRIVATE /arch:${MSVC_ARCH} /source-charset:utf-8 /execution-charset:shift_jis)
2733
elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
2834
target_link_options(${PROJECT_NAME} PRIVATE -static-libstdc++ -static)
2935
endif()

0 commit comments

Comments
 (0)