Skip to content

Commit

Permalink
setting CMP0135 NEW policy
Browse files Browse the repository at this point in the history
  • Loading branch information
kalwalt committed Sep 24, 2023
1 parent c54087a commit 8f65ada
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
4 changes: 2 additions & 2 deletions WebARKit/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ project(WebARKitLib)

set(CMAKE_CXX_STANDARD 14)

cmake_policy(SET CMP0135 NEW)

include(FetchContent)

FetchContent_Declare(
Expand All @@ -15,8 +17,6 @@ FetchContent_MakeAvailable(build_opencv)

get_filename_component(PARENT_DIR ./ ABSOLUTE)

#set( BUILD_WASM build_wasm )

set(WEBARKIT_HEADERS
${PARENT_DIR}/WebARKitTrackers/WebARKitOpticalTracking/include/WebARKitTrackers/WebARKitOpticalTracking/WebARKitConfig.h
${PARENT_DIR}/WebARKitTrackers/WebARKitOpticalTracking/include/WebARKitTrackers/WebARKitOpticalTracking//WebARKitEnums.h
Expand Down
6 changes: 2 additions & 4 deletions tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ project(Webarkit_tests)
# GoogleTest requires at least C++14
set(CMAKE_CXX_STANDARD 14)

cmake_policy(SET CMP0135 NEW)

# Fetch googletest v1.13.0 commit b796f7d44681514f58a683a3a71ff17c94edb0c1
include(FetchContent)
FetchContent_Declare(
Expand All @@ -30,7 +32,6 @@ add_executable(
)

get_filename_component(PARENT_DIR ../ ABSOLUTE)
get_filename_component(TEST_DIR ./ ABSOLUTE)

target_include_directories(webarkit_test PRIVATE "${PARENT_DIR}/WebARKit/include")
target_include_directories(webarkit_test PRIVATE "${PARENT_DIR}/WebARKit/WebARKitTrackers/WebARKitOpticalTracking/include")
Expand Down Expand Up @@ -62,11 +63,8 @@ target_link_libraries(
"${build_opencv_SOURCE_DIR}/lib/libopencv_video.a"
"${build_opencv_SOURCE_DIR}/lib/libopencv_xfeatures2d.a"
"${build_opencv_SOURCE_DIR}/lib/libopencv_imgproc.a"
#"${build_opencv_SOURCE_DIR}/lib/libopencv_video.a"
#"${build_opencv_SOURCE_DIR}/3rdparty/lib/libzlib.a"
"${build_opencv_SOURCE_DIR}/lib/libopencv_core.a"
"${build_opencv_SOURCE_DIR}/3rdparty/lib/libzlib.a"
#"${build_opencv_SOURCE_DIR}/lib/libopencv_xfeatures2d.a"
GTest::gtest_main
)

Expand Down

0 comments on commit 8f65ada

Please sign in to comment.