diff --git a/CMakeLists.txt b/CMakeLists.txt index 39edc78c..08a27ba6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -111,7 +111,7 @@ set(CPACK_PACKAGE_VERSION "${ZKLLVM_VERSION_MAJOR}.${ZKLLVM_VERSION_MINOR}.${ZKL if(ZKLLVM_VERSION_INCREMENT) string(APPEND CPACK_PACKAGE_VERSION "-${ZKLLVM_VERSION_INCREMENT}") endif() -set(CPACK_PACKAGING_INSTALL_PREFIX "/usr/lib/zkllvm") +set(CPACK_PACKAGING_INSTALL_PREFIX "/var/empty/lib/zkllvm") configure_file("${CMAKE_CURRENT_LIST_DIR}/cmake/zkllvm.conf.in" "${CMAKE_CURRENT_BINARY_DIR}/zkllvm.conf" diff --git a/bin/assigner/CMakeLists.txt b/bin/assigner/CMakeLists.txt index 0613c188..6a98635d 100644 --- a/bin/assigner/CMakeLists.txt +++ b/bin/assigner/CMakeLists.txt @@ -42,15 +42,13 @@ target_link_libraries(${CURRENT_PROJECT_NAME} LLVMCore LLVMSupport crypto3::all + crypto3::assigner crypto3::blueprint ${Boost_LIBRARIES}) target_include_directories(${CURRENT_PROJECT_NAME} PUBLIC - $ - $ ${CMAKE_SOURCE_DIR}/libs/circifier/llvm/include ${CMAKE_SOURCE_DIR}/libs/circifier/utils/bazel/llvm-project-overlay/llvm/include - ${CMAKE_SOURCE_DIR}/libs/assigner/include ${CMAKE_BINARY_DIR}/libs/circifier/llvm/include ${Boost_INCLUDE_DIRS}) diff --git a/bin/recursive_gen/CMakeLists.txt b/bin/recursive_gen/CMakeLists.txt index 4648b4d0..2245056a 100644 --- a/bin/recursive_gen/CMakeLists.txt +++ b/bin/recursive_gen/CMakeLists.txt @@ -43,8 +43,6 @@ target_link_libraries(${CURRENT_PROJECT_NAME} ${Boost_LIBRARIES}) target_include_directories(${CURRENT_PROJECT_NAME} PUBLIC - $ - $ ${CMAKE_SOURCE_DIR}/libs/circifier/llvm/include ${CMAKE_SOURCE_DIR}/libs/circifier/utils/bazel/llvm-project-overlay/llvm/include ${CMAKE_BINARY_DIR}/libs/circifier/llvm/include diff --git a/bin/transpiler/CMakeLists.txt b/bin/transpiler/CMakeLists.txt index f8cde599..105d946f 100644 --- a/bin/transpiler/CMakeLists.txt +++ b/bin/transpiler/CMakeLists.txt @@ -41,13 +41,11 @@ target_link_libraries(${CURRENT_PROJECT_NAME} crypto3::all crypto3::blueprint crypto3::assigner + crypto3::transpiler ${Boost_LIBRARIES}) target_include_directories(${CURRENT_PROJECT_NAME} PUBLIC - $ - $ ${CMAKE_SOURCE_DIR}/libs/circifier/llvm/include - ${CMAKE_SOURCE_DIR}/libs/transpiler/include ${CMAKE_SOURCE_DIR}/libs/circifier/utils/bazel/llvm-project-overlay/llvm/include ${Boost_INCLUDE_DIRS}) diff --git a/cmake/CheckSSE.cmake b/cmake/CheckSSE.cmake index 83cfe820..bc223dd7 100644 --- a/cmake/CheckSSE.cmake +++ b/cmake/CheckSSE.cmake @@ -59,7 +59,7 @@ macro(check_sse) endif(SSE42_TRUE) elseif(CMAKE_SYSTEM_NAME MATCHES "Darwin") - exec_program("/usr/sbin/sysctl -n machdep.cpu.features" OUTPUT_VARIABLE + exec_program("/var/empty/sbin/sysctl -n machdep.cpu.features" OUTPUT_VARIABLE CPUINFO) string(REGEX REPLACE "^.*[^S](SSE2).*$" "\\1" SSE_THERE "${CPUINFO}") diff --git a/cmake/create-symlinks.cmake b/cmake/create-symlinks.cmake index c8c5d6b5..88c1e03d 100644 --- a/cmake/create-symlinks.cmake +++ b/cmake/create-symlinks.cmake @@ -5,7 +5,7 @@ list(APPEND LLVM_BINARIES clang llvm-link) # Link directory would differ for cases when we have DESTDIR from CPack or simple installation if (DEFINED ENV{DESTDIR}) - set(LINK_DESTDIR $ENV{DESTDIR}/usr/bin) + set(LINK_DESTDIR $ENV{DESTDIR}/var/empty/bin) else() set(LINK_DESTDIR ${CMAKE_INSTALL_PREFIX}/bin) endif()