From eced41b7c3100ceed7736c15ed0c1770ddf6b600 Mon Sep 17 00:00:00 2001 From: Sam Edwards Date: Mon, 3 Feb 2014 21:47:27 -0700 Subject: [PATCH] CMake: Move Interrogate.cmake's _LP64 detection to the top of the script, where it gets added to IGATE_FLAGS. --- cmake/macros/Interrogate.cmake | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/cmake/macros/Interrogate.cmake b/cmake/macros/Interrogate.cmake index 7857425c2b..20e10282cc 100644 --- a/cmake/macros/Interrogate.cmake +++ b/cmake/macros/Interrogate.cmake @@ -10,6 +10,12 @@ set(IGATE_FLAGS -DCPPPARSER -D__cplusplus -Dvolatile -Dmutable -python-native) +# In addition, Interrogate needs to know if this is a 64-bit build: +if(CMAKE_SIZEOF_VOID_P EQUAL 8) + list(APPEND IGATE_FLAGS "-D_LP64") +endif() + + # This is a list of regexes that are applied to every filename. If one of the # regexes matches, that file will not be passed to Interrogate. set(INTERROGATE_EXCLUDE_REGEXES @@ -174,10 +180,6 @@ function(interrogate_sources target output database module) if("${CMAKE_CXX_FLAGS_${build_type}}" MATCHES ".*NDEBUG.*") list(APPEND define_flags "-DNDEBUG") endif() - # In addition, Interrogate needs to know if this is a 64-bit build: - if(CMAKE_SIZEOF_VOID_P EQUAL 8) - list(APPEND define_flags "-D_LP64") - endif() # CMake offers no way to directly depend on the composite files from here, # because the composite files are created in a different directory from