Commit 72645edf authored by Davis King's avatar Davis King

Fixed visual studio errors about openmp compiler flags not being right.

parent 85a817da
...@@ -662,8 +662,10 @@ if (NOT TARGET dlib) ...@@ -662,8 +662,10 @@ if (NOT TARGET dlib)
if (OPENMP_FOUND) if (OPENMP_FOUND)
# Enable OpenMP # Enable OpenMP
target_compile_options(dlib PUBLIC ${OpenMP_CXX_FLAGS}) target_compile_options(dlib PUBLIC ${OpenMP_CXX_FLAGS})
if (NOT MSVC)
target_link_libraries(dlib PUBLIC ${OpenMP_CXX_FLAGS}) target_link_libraries(dlib PUBLIC ${OpenMP_CXX_FLAGS})
endif() endif()
endif()
if (UNIX AND NOT DLIB_IN_PROJECT_BUILD) if (UNIX AND NOT DLIB_IN_PROJECT_BUILD)
if (DLIB_USE_CUDA) if (DLIB_USE_CUDA)
cuda_add_library(dlib_shared SHARED ${source_files} ) cuda_add_library(dlib_shared SHARED ${source_files} )
...@@ -681,9 +683,11 @@ if (NOT TARGET dlib) ...@@ -681,9 +683,11 @@ if (NOT TARGET dlib)
if (OPENMP_FOUND) if (OPENMP_FOUND)
# Enable OpenMP # Enable OpenMP
target_compile_options(dlib_shared PUBLIC ${OpenMP_CXX_FLAGS}) target_compile_options(dlib_shared PUBLIC ${OpenMP_CXX_FLAGS})
if (NOT MSVC)
target_link_libraries(dlib_shared PUBLIC ${OpenMP_CXX_FLAGS}) target_link_libraries(dlib_shared PUBLIC ${OpenMP_CXX_FLAGS})
endif() endif()
endif() endif()
endif()
endif () ##### end of if NOT DLIB_ISO_CPP_ONLY ########################################################## endif () ##### end of if NOT DLIB_ISO_CPP_ONLY ##########################################################
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment