Skip to content

Commit 5fec061

Browse files
committed
put correct install path for Cubature, d'oh
1 parent 595bf03 commit 5fec061

File tree

2 files changed

+2
-44
lines changed

2 files changed

+2
-44
lines changed

cmake_files/LookUpCubature.cmake

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,15 @@ if(NOT Cubature_GIT_TAG)
1414
set(Cubature_GIT_TAG master)
1515
endif()
1616

17+
set(Cubature_DIR "${CMAKE_INSTALL_PREFIX}/external")
1718
ExternalProject_Add(
1819
Lookup-Cubature
1920
GIT_REPOSITORY ${Cubature_GIT_REPOSITORY}
2021
GIT_TAG ${Cubature_GIT_TAG}
2122
PREFIX "${CMAKE_BINARY_DIR}/external"
2223
#INSTALL_DIR ${EXTERNAL_ROOT}
2324
CMAKE_ARGS
24-
-DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/external
25+
-DCMAKE_INSTALL_PREFIX=${Cubature_DIR}
2526
-DCMAKE_INSTALL_LIBDIR=${CMAKE_SHARED_LIBRARY_PREFIX}
2627
# Wrap download, configure and build steps in a script to log output
2728
UPDATE_COMMAND ""
@@ -30,8 +31,6 @@ ExternalProject_Add(
3031
LOG_BUILD ON
3132
LOG_INSTALL ON
3233
)
33-
ExternalProject_Get_Property(Lookup-Cubature install_dir)
34-
set(Cubature_DIR "${install_dir}")
3534
set(Cubature_INCLUDE_DIR "${Cubature_DIR}/include")
3635
set(Cubature_LIBRARY_DIR "${Cubature_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}")
3736
set(Cubature_LIBRARIES "cubature")

cmake_files/LookUpONNXRT.cmake

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)