summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--cmake/msvc.cmake4
-rw-r--r--cmake/opentrack-platform.cmake3
-rw-r--r--cv/CMakeLists.txt4
3 files changed, 6 insertions, 5 deletions
diff --git a/cmake/msvc.cmake b/cmake/msvc.cmake
index 3ab0192c..9f77bddf 100644
--- a/cmake/msvc.cmake
+++ b/cmake/msvc.cmake
@@ -68,7 +68,7 @@ set(_LDFLAGS "-machine:X86 -DEBUG")
#set(_ltcg "-LTCG")
set(_ltcg "-LTCG:INCREMENTAL")
-set(_LDFLAGS_RELEASE "-OPT:REF,ICF -cgthreads:1 ${_ltcg}")
+set(_LDFLAGS_RELEASE "-OPT:REF,ICF=4 -verbose -cgthreads:1 ${_ltcg}")
set(_LDFLAGS_DEBUG "")
set(_LDFLAGS_STATIC "-machine:X86 -WX")
@@ -77,7 +77,7 @@ set(_LDFLAGS_STATIC_DEBUG "")
# debugging build times
#set(_CXXFLAGS "${_CXXFLAGS} -Bt+")
-set(_LDFLAGS "${_LDFLAGS} -time")
+#set(_LDFLAGS "${_LDFLAGS} -time")
set(CMAKE_RC_FLAGS "/nologo -DWIN32")
diff --git a/cmake/opentrack-platform.cmake b/cmake/opentrack-platform.cmake
index 332fd51f..ea13bf64 100644
--- a/cmake/opentrack-platform.cmake
+++ b/cmake/opentrack-platform.cmake
@@ -83,7 +83,8 @@ if(MSVC)
endif()
foreach (i SHARED MODULE EXE)
- set(CMAKE_${i}_LINKER_FLAGS "${CMAKE_${i}_LINKER_FLAGS} -DYNAMICBASE -NXCOMPAT -DEBUG ${ent}")
+ # 4020 is compiler bug for opentrack-cv
+ set(CMAKE_${i}_LINKER_FLAGS "${CMAKE_${i}_LINKER_FLAGS} -DYNAMICBASE -NXCOMPAT -DEBUG -ignore:4020 ${ent} ")
endforeach()
endif()
diff --git a/cv/CMakeLists.txt b/cv/CMakeLists.txt
index 47c5a6dc..1007344c 100644
--- a/cv/CMakeLists.txt
+++ b/cv/CMakeLists.txt
@@ -1,6 +1,6 @@
find_package(OpenCV QUIET)
if(OpenCV_FOUND)
otr_module(cv STATIC)
- target_link_libraries(opentrack-cv opencv_core opencv_videoio)
- target_include_directories(opentrack-cv SYSTEM PRIVATE ${OpenCV_INCLUDE_DIRS})
+ target_link_libraries(${self} opencv_core opencv_videoio)
+ target_include_directories(${self} SYSTEM PRIVATE ${OpenCV_INCLUDE_DIRS})
endif()