Fix hardcoded paths in CCF install (#950)

microsoft · Mar 13, 2020 · aee15c6 · aee15c6
1 parent d0e07d8
commit aee15c6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 16 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,7 +7,7 @@ include(${CCF_DIR}/cmake/preproject.cmake)
 
 project(
   ccf
-  VERSION 0.8.1
+  VERSION 0.8.2
   LANGUAGES C CXX
 )
 
@@ -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)
@@ -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)

diff --git a/cmake/secp256k1.cmake b/cmake/secp256k1.cmake
@@ -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
@@ -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)