Merge pull request #3 from AliceO2Group/fix_for_tcl_mac

Fix for TCL on Mac
AliceO2Group · Dec 13, 2017 · 689b00b · 689b00b
2 parents 917a267 + 4b8670a
commit 689b00b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -148,5 +148,6 @@ if (TCL_FOUND)
             src/Configuration_tcl_wrap.cxx
             )
     set(LIBRARY_NAME tclConfiguration)
+    set(BUCKET_NAME o2_common_with_tcl_bucket)
     O2_GENERATE_LIBRARY()
 endif ()
diff --git a/cmake/CommonDependencies.cmake b/cmake/CommonDependencies.cmake
@@ -4,23 +4,26 @@ find_package(TCL)
 
 
 o2_define_bucket(
-  NAME
-  o2_common_bucket
+    NAME
+    o2_common_bucket
 
-  DEPENDENCIES
-  ${Boost_PROGRAM_OPTIONS_LIBRARY}
-  ${Boost_FILESYSTEM_LIBRARY}
-  ${Boost_SYSTEM_LIBRARY}
-  pthread
+    DEPENDENCIES
+    ${Boost_PROGRAM_OPTIONS_LIBRARY}
+    ${Boost_FILESYSTEM_LIBRARY}
+    ${Boost_SYSTEM_LIBRARY}
+    pthread
 
-  SYSTEMINCLUDE_DIRECTORIES
-  ${Boost_INCLUDE_DIRS}
+    SYSTEMINCLUDE_DIRECTORIES
+    ${Boost_INCLUDE_DIRS}
 )
 
+
+
 o2_define_bucket(
-        NAME
-        o2_dataformat_bucket
+    NAME
+    o2_common_with_tcl_bucket
 
-        SYSTEMINCLUDE_DIRECTORIES
-        ${Boost_INCLUDE_DIRS}
+    DEPENDENCIES
+    o2_common_bucket
+    ${TCL_LIBRARY}
 )