Skip to content

S
stitchEm
Commit 5d28c74b authored by Jeremy Tellaa's avatar Jeremy Tellaa Committed by jeremad
Browse files
Options

fix glog linking

parent 299f4a47
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 3 deletions
apps/installer/sign.bat deleted 100755 → 0
View file @ 299f4a47
signtool sign /v /t http://timestamp.digicert.com /f ../../../../certificate.pfx /p x87h7P20Pc /d "VideoStitch" %1
apps/src/videostitch-live-gui/CMakeLists.txt
View file @ 5d28c74b
...@@ -371,7 +371,6 @@ if(ENABLE_YOUTUBE_OUTPUT) ...@@ -371,7 +371,6 @@ if(ENABLE_YOUTUBE_OUTPUT)
find_debug_and_optimized_library(GGJSON "googleapis/debug" "googleapis_json" "googleapis/release" "googleapis_json") find_debug_and_optimized_library(GGJSON "googleapis/debug" "googleapis_json" "googleapis/release" "googleapis_json")
find_debug_and_optimized_library(GGJSONPB "googleapis/debug" "googleapis_jsonplayback" "googleapis/release" "googleapis_jsonplayback") find_debug_and_optimized_library(GGJSONPB "googleapis/debug" "googleapis_jsonplayback" "googleapis/release" "googleapis_jsonplayback")
find_debug_and_optimized_library(GGSCRIBES "googleapis/debug" "googleapis_scribes" "googleapis/release" "googleapis_scribes") find_debug_and_optimized_library(GGSCRIBES "googleapis/debug" "googleapis_scribes" "googleapis/release" "googleapis_scribes")
find_library(GLOG NAMES "libglog" PATHS "${CMAKE_EXTERNAL_LIB}/glog")
find_library(CURL NAMES "libcurl" PATHS "${CMAKE_EXTERNAL_LIB}/curl") find_library(CURL NAMES "libcurl" PATHS "${CMAKE_EXTERNAL_LIB}/curl")
endif(WINDOWS) endif(WINDOWS)
...@@ -453,7 +452,7 @@ endif() ...@@ -453,7 +452,7 @@ endif()
if(WINDOWS) if(WINDOWS)
if(ENABLE_YOUTUBE_OUTPUT) if(ENABLE_YOUTUBE_OUTPUT)
target_include_directories(${VS_VAHANA_BIN} PRIVATE "${CMAKE_EXTERNAL_DEPS}/include/youtubeapi") target_include_directories(${VS_VAHANA_BIN} PRIVATE "${CMAKE_EXTERNAL_DEPS}/include/youtubeapi")
target_link_libraries(${VS_VAHANA_BIN} PRIVATE ${GGJSON} ${GGJSONPB} ${GGSCRIBES} ${GLOG} ${CURL} ${JSON}) target_link_libraries(${VS_VAHANA_BIN} PRIVATE ${GGJSON} ${GGJSONPB} ${GGSCRIBES} ${CURL} ${JSON})
endif() endif()
target_link_libraries(${VS_VAHANA_BIN} PRIVATE ${OVR} ${OPENVR}) target_link_libraries(${VS_VAHANA_BIN} PRIVATE ${OVR} ${OPENVR})
endif(WINDOWS) endif(WINDOWS)
......
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