feat(compiler): wip

zama-ai · Feb 11, 2025 · ac0244d · ac0244d
1 parent f08a3c0
commit ac0244d
Showing 1 changed file with 31 additions and 12 deletions.
diff --git a/compilers/concrete-compiler/compiler/CMakeLists.txt b/compilers/concrete-compiler/compiler/CMakeLists.txt
@@ -181,25 +181,44 @@ option(CONCRETELANG_TIMING_ENABLED "Enables execution timing." ON)
 if(CONCRETELANG_DATAFLOW_EXECUTION_ENABLED)
   message(STATUS "ConcreteLang dataflow execution enabled.")
 
-  set(HPX_VERSION 1.0.1)
-  set(HPX_BIN_DIR ${CMAKE_CURRENT_BINARY_DIR}/hpx_bin_dir)
-  set(HPX_SRC_DIR ${CMAKE_CURRENT_BINARY_DIR}/hpx_src_dir)
-  set(HPX_LIB_DIR ${HPX_BIN_DIR}/c++/src)
-  set(HPX_INCLUDE_DIR ${HPX_SRC_DIR}/c++/src)
   ExternalProject_Add(
-    hpx
+    hpx_repo
     GIT_REPOSITORY https://github.com/STEllAR-GROUP/hpx.git
     GIT_TAG v1.9.1
     GIT_SUBMODULES_RECURSE ON
     GIT_PROGRESS   TRUE
     UPDATE_DISCONNECTED TRUE
-    BUILD_ALWAYS 1
-    # INSTALL_COMMAND cp ${CAPNP_LIB_DIR}/capnp/${CAPNP_LIBRARY} ${CAPNP_LIB_DIR}/capnp/${CAPNP_JSON_LIBRARY} ${CAPNP_LIB_DIR}/kj/${KJ_LIBRARY} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
-    # BINARY_DIR ${CAPNP_BIN_DIR}
-    # SOURCE_DIR ${CAPNP_SRC_DIR}
-    CMAKE_ARGS -DHPX_WITH_MAX_CPU_COUNT="" -DHPX_WITH_FETCH_ASIO=on -DHPX_FILESYSTEM_WITH_BOOST_FILESYSTEM_COMPATIBILITY=ON -DHPX_WITH_MALLOC=system -DHPX_WITH_STATIC_LINKING=ON
-    # BUILD_BYPRODUCTS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CAPNP_LIBRARY} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CAPNP_JSON_LIBRARY} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${KJ_LIBRARY} $   {CAPNP_CMD}
+    BUILD_ALWAYS TRUE
+    BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/hpx_bin_dir
+    SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/hpx_src_dir
+    INSTALL_DIR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
+    CMAKE_ARGS
+        -DHPX_WITH_FETCH_ASIO=ON
+        -DHPX_FILESYSTEM_WITH_BOOST_FILESYSTEM_COMPATIBILITY=ON
+        -DHPX_WITH_MALLOC=system
+        -DHPX_WITH_STATIC_LINKING=ON
+    BUILD_BYPRODUCTS
+        ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libhpx.a
+        ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libhpx_iostreams.a
+
+  )
+  add_library(HPX::hpx STATIC IMPORTED)
+  set_property(
+    TARGET HPX::hpx
+    PROPERTY
+    IMPORTED_LOCATION
+    ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libhpx.a
   )
+  add_dependencies(HPX::hpx hpx_repo)
+  add_library(HPX::iostreams_component STATIC IMPORTED)
+  set_property(
+    TARGET HPX::iostreams_component
+    PROPERTY
+    IMPORTED_LOCATION
+    ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libhpx_iostreams.a
+  )
+  add_dependencies(HPX::iostreams_component hpx_repo)
+
 
   add_compile_options(-DCONCRETELANG_DATAFLOW_EXECUTION_ENABLED
                       -DHPX_DEFAULT_CONFIG_FILE="${PROJECT_SOURCE_DIR}/hpx.ini")