Merge pull request #1094 from grondo/more-build-fixes

build: fixes for minor build issues
flux-framework · Oct 2, 2023 · a08d318 · a08d318
2 parents b29177b + 48bac5f
commit a08d318
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -58,6 +58,8 @@ find_package(FluxCore REQUIRED)
 if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
   message(STATUS "flux core found and no specific prefix specified, using ${FLUX_CORE_PREFIX}")
   set(CMAKE_INSTALL_PREFIX ${FLUX_CORE_PREFIX} CACHE PATH "..." FORCE)
+  message(STATUS "Using flux-core libdir of ${FLUX_CORE_LIBDIR}")
+  set(CMAKE_INSTALL_LIBDIR ${FLUX_CORE_LIBDIR} CACHE PATH "..." FORCE)
 endif()
 if(DEFINED ENV{PYTHON})
   set(Python_EXECUTABLE $ENV{PYTHON} CACHE FILEPATH "")

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -47,6 +47,6 @@ if(SPHINX AND ENABLE_DOCS)
         ${Python_EXECUTABLE} -m sphinx -b html ${CMAKE_CURRENT_SOURCE_DIR} ./html
         )
     add_custom_target(html DEPENDS ${man5_html_outputs})
-    add_custom_target(docs
-        DEPENDS html manpages)
+    add_custom_target(docs ALL
+        DEPENDS manpages)
 endif()
diff --git a/resource/CMakeLists.txt b/resource/CMakeLists.txt
@@ -40,7 +40,7 @@ set(RESOURCE_HEADERS
     store/resource_graph_store.hpp
     )
 
-add_library(resource SHARED
+add_library(resource STATIC
     policies/dfu_match_locality.cpp
     policies/dfu_match_var_aware.cpp
     policies/dfu_match_policy_factory.cpp
@@ -87,8 +87,6 @@ target_link_libraries(resource PUBLIC
     jobspec_conv
     Boost::filesystem
     )
-install(TARGETS resource
-        LIBRARY)
 
 add_subdirectory(modules)
 add_subdirectory(reapi)

diff --git a/resource/reapi/bindings/go/src/test/CMakeLists.txt b/resource/reapi/bindings/go/src/test/CMakeLists.txt
@@ -3,7 +3,7 @@ set(SRCS main.go)
 set(CGO_CFLAGS "-I${CMAKE_BINARY_DIR}/resource/reapi/bindings/c")
 
 # This is currently passed but not used because when passed into add_custom_command the spaces are escaped
-set(CGO_LIBRARY_FLAGS "-Wl,-R ${CMAKE_BINARY_DIR}/resource -L${CMAKE_BINARY_DIR}/resource/reapi/bindings -L${CMAKE_BINARY_DIR}/resource/libjobspec -ljobspec_conv -lreapi_cli -L${CMAKE_BINARY_DIR}/resource -lresource -lflux-idset -lstdc++ -lczmq -ljansson -lhwloc -lboost_system -lflux-hostlist -lboost_graph -lyaml-cpp")
+set(CGO_LIBRARY_FLAGS "-Wl,-R ${CMAKE_BINARY_DIR}/resource -L${CMAKE_BINARY_DIR}/resource/reapi/bindings -L${CMAKE_BINARY_DIR}/resource/libjobspec -ljobspec_conv -lreapi_cli -L${CMAKE_BINARY_DIR}/resource -lresource -L${CMAKE_BINARY_DIR}/resource/planner/c -lplanner -L${CMAKE_BINARY_DIR}/resource/planner/c++ -lplanner_cxx -lflux-idset -lstdc++ -lczmq -ljansson -lhwloc -lboost_system -lflux-hostlist -lboost_graph -lyaml-cpp")
 
 # This ensures the main binary is cleaned up
 set_directory_properties(