Skip to content
Snippets Groups Projects
Commit a10c25ee authored by Nicolas Pope's avatar Nicolas Pope
Browse files

Fix windows link dir

parent 40ab8d89
No related branches found
No related tags found
1 merge request!308Resolves #274 compression filtering
Pipeline #27095 failed
...@@ -56,7 +56,7 @@ webserver-deploy: ...@@ -56,7 +56,7 @@ webserver-deploy:
- mkdir build - mkdir build
- cd build - cd build
- echo cmake %CMAKE_ARGS% %CMAKE_ARGS_WINDOWS% -DNANOGUI_DIR="C:/Program Files (x86)/NanoGUI" .. - echo cmake %CMAKE_ARGS% %CMAKE_ARGS_WINDOWS% -DNANOGUI_DIR="C:/Program Files (x86)/NanoGUI" ..
- cmake %CMAKE_ARGS% %CMAKE_ARGS_WINDOWS% -DREALSENSE_DIR="C:/Program Files (x86)/Intel RealSense SDK 2.0" -DNANOGUI_DIR="C:/Program Files (x86)/NanoGUI" .. - cmake %CMAKE_ARGS% %CMAKE_ARGS_WINDOWS% -DREALSENSE_DIR="C:/Program Files (x86)/Intel RealSense SDK 2.0" -DNANOGUI_DIR="C:/Program Files (x86)/NanoGUI -DOPUS_DIR="C:/Program Files (x86)/Opus" ..
- devenv ftl.utu.fi.sln /build Release - devenv ftl.utu.fi.sln /build Release
- rmdir /q /s "%DEPLOY_DIR%/%CI_COMMIT_REF_SLUG%" - rmdir /q /s "%DEPLOY_DIR%/%CI_COMMIT_REF_SLUG%"
- mkdir "%DEPLOY_DIR%/%CI_COMMIT_REF_SLUG%" - mkdir "%DEPLOY_DIR%/%CI_COMMIT_REF_SLUG%"
......
...@@ -31,14 +31,6 @@ $<TARGET_OBJECTS:OpenCVCodec> ...@@ -31,14 +31,6 @@ $<TARGET_OBJECTS:OpenCVCodec>
) )
if (HAVE_NVPIPE) if (HAVE_NVPIPE)
if (WIN32)
if (CMAKE_SIZEOF_VOID_P EQUAL 8)
link_directories(src/Video_Codec_SDK_9.1.23/Lib/x64)
elseif (CMAKE_SIZEOF_VOID_P EQUAL 4)
link_directories(src/Video_Codec_SDK_9.1.23/Lib/Win32)
endif()
endif()
add_library(NvPipeCodec OBJECT add_library(NvPipeCodec OBJECT
src/nvpipe_encoder.cpp src/nvpipe_encoder.cpp
src/nvpipe_decoder.cpp src/nvpipe_decoder.cpp
...@@ -56,6 +48,14 @@ endif() ...@@ -56,6 +48,14 @@ endif()
add_library(ftlcodecs ${CODECSRC}) add_library(ftlcodecs ${CODECSRC})
if (WIN32)
if (CMAKE_SIZEOF_VOID_P EQUAL 8)
target_link_directories(ftlcodecs PUBLIC src/Video_Codec_SDK_9.1.23/Lib/x64)
elseif (CMAKE_SIZEOF_VOID_P EQUAL 4)
target_link_directories(ftlcodecs PUBLIC src/Video_Codec_SDK_9.1.23/Lib/Win32)
endif()
endif()
target_include_directories(ftlcodecs PUBLIC target_include_directories(ftlcodecs PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment