fixed installation script.

flux-framework · Nov 23, 2023 · b77a3b5 · b77a3b5
1 parent ef5b3e8
commit b77a3b5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -114,3 +114,5 @@ flux_barrier
 **/__pycache__/
 **/build
 **/*.egg-info
+/install/
+/dyad-env/
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -177,7 +177,7 @@ function(dyad_install_headers public_headers current_dir)
         get_filename_component(header_directory_path "${header_file_path}" DIRECTORY)
         install(
                 FILES ${header}
-                DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${header_directory_path}"
+                DESTINATION "${CMAKE_INSTALL_PREFIX}/include/${header_directory_path}"
         )
         file(COPY ${header}
                 DESTINATION "${CMAKE_INCLUDE_OUTPUT_DIRECTORY}/${header_directory_path}")

diff --git a/src/dyad/core/CMakeLists.txt b/src/dyad/core/CMakeLists.txt
@@ -6,6 +6,7 @@ add_library(dyad_core SHARED ${DYAD_CORE_SRC})
 target_link_libraries(dyad_core PUBLIC Jansson::Jansson flux::core)
 target_link_libraries(dyad_core PRIVATE utils murmur3 dyad_dtl)
 target_compile_definitions(dyad_core PUBLIC BUILDING_DYAD=1)
+set_target_properties(dyad_core PROPERTIES PUBLIC_HEADER ${DYAD_CORE_PUBLIC_HEADER})
 
 if(DYAD_PROFILER STREQUAL "PERFFLOW_ASPECT")
     target_link_libraries(dyad_core PUBLIC perfflowaspect::perfflowaspect)