Skip to content

Fix hardcoded paths in CCF install #950

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Mar 13, 2020
Merged

Fix hardcoded paths in CCF install #950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ff38ac5
Fix (use "")
Mar 13, 2020
df11599
Should be relocatable now
Mar 13, 2020
fc50b24
Format
Mar 13, 2020
39c0e3a
Delete dummy main
Mar 13, 2020
ba83710
0.8.2
Mar 13, 2020
a60a6c6
Merge branch 'master' into fix_hardcoded_install
jumaffre Mar 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ include(${CCF_DIR}/cmake/preproject.cmake)

project(
ccf
VERSION 0.8.1
VERSION 0.8.2
LANGUAGES C CXX
)

Expand Down Expand Up @@ -59,11 +59,11 @@ if("sgx" IN_LIST TARGET)
target_include_directories(
ccf.enclave SYSTEM
PUBLIC
$<BUILD_INTERFACE:${EVERCRYPT_INC}>
"$<BUILD_INTERFACE:${EVERCRYPT_INC}>"
$<BUILD_INTERFACE:${CCF_GENERATED_DIR}>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include/3rdparty/hacl-star/evercrypt>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include/3rdparty/hacl-star/evercrypt/kremlin>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include/3rdparty/hacl-star/evercrypt/kremlin/kremlib>
$<INSTALL_INTERFACE:include/3rdparty/hacl-star/evercrypt>
$<INSTALL_INTERFACE:include/3rdparty/hacl-star/evercrypt/kremlin>
$<INSTALL_INTERFACE:include/3rdparty/hacl-star/evercrypt/kremlin/kremlib>
)

target_link_libraries(ccf.enclave PUBLIC libbyz.enclave)
Expand Down Expand Up @@ -111,11 +111,11 @@ if("virtual" IN_LIST TARGET)
target_include_directories(
ccf.virtual SYSTEM
PUBLIC
$<BUILD_INTERFACE:${EVERCRYPT_INC}>
"$<BUILD_INTERFACE:${EVERCRYPT_INC}>"
$<BUILD_INTERFACE:${CCF_GENERATED_DIR}>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include/3rdparty/hacl-star/evercrypt>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include/3rdparty/hacl-star/evercrypt/kremlin>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include/3rdparty/hacl-star/evercrypt/kremlin/kremlib>
$<INSTALL_INTERFACE:include/3rdparty/hacl-star/evercrypt>
$<INSTALL_INTERFACE:include/3rdparty/hacl-star/evercrypt/kremlin>
$<INSTALL_INTERFACE:include/3rdparty/hacl-star/evercrypt/kremlin/kremlib>
)

target_link_libraries(ccf.virtual PUBLIC libbyz.host)
Expand Down
11 changes: 4 additions & 7 deletions cmake/secp256k1.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@ if("sgx" IN_LIST TARGET)
secp256k1.enclave STATIC ${CCF_DIR}/3rdparty/secp256k1/src/secp256k1.c
)
target_include_directories(
secp256k1.enclave
PUBLIC
$<BUILD_INTERFACE:${CCF_DIR}/3rdparty/secp256k1>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include/3rdparty/secp256k1>
secp256k1.enclave PUBLIC $<BUILD_INTERFACE:${CCF_DIR}/3rdparty/secp256k1>
$<INSTALL_INTERFACE:include/3rdparty/secp256k1>
)
target_compile_options(
secp256k1.enclave PRIVATE -fvisibility=hidden -nostdinc
Expand All @@ -28,9 +26,8 @@ endif()

add_library(secp256k1.host STATIC ${CCF_DIR}/3rdparty/secp256k1/src/secp256k1.c)
target_include_directories(
secp256k1.host
PUBLIC $<BUILD_INTERFACE:${CCF_DIR}/3rdparty/secp256k1>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include/3rdparty/secp256k1>
secp256k1.host PUBLIC $<BUILD_INTERFACE:${CCF_DIR}/3rdparty/secp256k1>
$<INSTALL_INTERFACE:include/3rdparty/secp256k1>
)
target_compile_options(secp256k1.host PRIVATE -fvisibility=hidden)
target_compile_definitions(secp256k1.host PRIVATE HAVE_CONFIG_H SECP256K1_BUILD)
Expand Down