Skip to content

Commit

Permalink
cmake: Prefix ROOT_GENERATE_DICTIONARY with FAIRROOT
Browse files Browse the repository at this point in the history
Fixes: #1221

Our `ROOT_GENERATE_DICTIONARY` conflicts with a CMake macro
by ROOT.

So rename ours to `FAIRROOT_GENERATE_DICTIONARY`.
  • Loading branch information
ChristianTackeGSI authored and karabowi committed Jan 26, 2023
1 parent 87e07ed commit 628023c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
flexible local code by users.
* Replace with a local template, `configure_file`, and `execute_process()`
* In your template consider using `source @FairRoot_BINDIR/FairRootConfig.sh`
* Renamed our `ROOT_GENERATE_DICTIONARY` to `FAIRROOT_GENERATE_DICTIONARY`.
(It's not used in many places anyway, it seems.)
### Deprecations
Expand Down
6 changes: 3 additions & 3 deletions cmake/modules/ROOTMacros.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ Find_Program(ROOT_CINT_EXECUTABLE
)


macro(ROOT_GENERATE_DICTIONARY)
macro(FAIRROOT_GENERATE_DICTIONARY)
if(${ARGC} GREATER 0)
message(FATAL_ERROR "ROOT_GENERATE_DICTIONARY has no args")
message(FATAL_ERROR "FAIRROOT_GENERATE_DICTIONARY has no args")
endif()
if(NOT FAIRROOTPATH)
message(FATAL_ERROR "Do not call from inside FairRoot")
Expand Down Expand Up @@ -206,7 +206,7 @@ Macro(GENERATE_LIBRARY)
Else( IS_ABSOLUTE ${LINKDEF})
Set(Int_LINKDEF ${CMAKE_CURRENT_SOURCE_DIR}/${LINKDEF})
EndIf( IS_ABSOLUTE ${LINKDEF})
ROOT_GENERATE_DICTIONARY()
FAIRROOT_GENERATE_DICTIONARY()
SET(Int_SRCS ${Int_SRCS} ${DICTIONARY})
SET_SOURCE_FILES_PROPERTIES(${DICTIONARY}
PROPERTIES COMPILE_FLAGS "-Wno-old-style-cast"
Expand Down

0 comments on commit 628023c

Please sign in to comment.