Project

General

Profile

Bug #23184

building with mrb

Added by Ron Rechenmacher 4 months ago. Updated 4 months ago.

Status:
Resolved
Priority:
Normal
Assignee:
-
Start date:
08/28/2019
Due date:
% Done:

100%

Estimated time:
Duration:

Description

weird thing with includes....
had to adjust 3 CMakeLists files

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5ff029b..a2213c8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,7 +54,7 @@ cet_report_compiler_flags()
 find_ups_boost  ( v1_66_0 )
 find_ups_product( cetbuildtools v5_08_00 )
 find_ups_product( cetpkgsupport v1_11_00 )
-find_ups_product( mongodb v4_0_8b )
+find_ups_product( mongodb v4_0_8 )  # find_ups_product doesn't like v4_0_8b
 find_ups_product( TRACE v3_13_05 )
 find_ups_product( swig v3_0_12 )

diff --git a/artdaq-database/CMakeLists.txt b/artdaq-database/CMakeLists.txt
index c244c3a..80920bc 100644
--- a/artdaq-database/CMakeLists.txt
+++ b/artdaq-database/CMakeLists.txt
@@ -1,4 +1,7 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${TOP_CMAKE_SOURCE_DIR}
+ ${TOP_CMAKE_SOURCE_DIR}/built-in/fhicl-cpp
+ ${TOP_CMAKE_SOURCE_DIR}/built-in/cetlib
+ $ENV{MONGODB_INC}) # this is really bad -- we don't know why find_ups_product isn't doing this

 IF (FORMAT_WITH_CLANG)
   string(TOUPPER ${FORMAT_WITH_CLANG} FORMAT_WITH_CLANG_UC )
diff --git a/built-in/CMakeLists.txt b/built-in/CMakeLists.txt
index d635589..3b7f4e9 100644
--- a/built-in/CMakeLists.txt
+++ b/built-in/CMakeLists.txt
@@ -72,6 +72,8 @@ IF(CETLIB_IS_STATIC)
     ${Boost_FILESYSTEM_LIBRARY}
     ${Boost_SYSTEM_LIBRARY}
     )
+^M
+  include_directories( ${TOP_CMAKE_SOURCE_DIR}/built-in/cetlib )^M

   add_library(${CETLIB} STATIC ${SOURCES})
   set_property(TARGET ${CETLIB} PROPERTY POSITION_INDEPENDENT_CODE ON)
@@ -132,6 +134,8 @@ IF(FHICLCPP_IS_STATIC)
     ${CETLIB_EXCEPT}
     )

+  include_directories( ${TOP_CMAKE_SOURCE_DIR}/built-in/fhicl-cpp )^M
+    ^M
   add_library(${FHICLCPP} STATIC ${SOURCES})
   set_property(TARGET ${FHICLCPP} PROPERTY POSITION_INDEPENDENT_CODE ON)
   target_link_libraries(${FHICLCPP} ${LIBRARIES})  

History

#1 Updated by Ron Rechenmacher 4 months ago

created branch feature/23184_build_with_mrb

#2 Updated by Ron Rechenmacher 4 months ago

  • % Done changed from 0 to 100
  • Status changed from New to Resolved

Gennadiy built all varieties on Jenkins



Also available in: Atom PDF