[thrift] drop stdcxx namespace (#239)

* thrift: drop stdcxx namespace

since thrift has dropped support for stdcxx.h that makes jaeger
incompatible with latest thrift and hence jaeger failure:

/home/ideepika/ceph-primary/ceph/src/jaegertracing/jaeger-client-cpp/src/jaegertracing/thrift-gen/agent_types.h:18:10: fatal error: thrift/stdcxx.h: No such file or directory
   18 | #include <thrift/stdcxx.h>
      |          ^~~~~~~~~~~~~~~~~
this change will make jaeger compatible with latest thrift.

see: apache/thrift#1677

Signed-off-by: Deepika Upadhyay <[email protected]>

* thrift: fix warning due to difference in naming.

fixes warning:

CMake Warning (dev) at /usr/share/cmake/Modules/FindPackageHandleStandardArgs.cmake:272 (message):
  The package name passed to `find_package_handle_standard_args` (THRIFT)
  does not match the name of the calling package (thrift).  This can lead to
  problems in calling code that expects `find_package` result variables
  (e.g., `_FOUND`) to follow a certain pattern.
Call Stack (most recent call first):
  cmake/Findthrift.cmake:92 (FIND_PACKAGE_HANDLE_STANDARD_ARGS)
  CMakeLists.txt:63 (find_package)
This warning is for project developers.  Use -Wno-dev to suppress it.

Signed-off-by: Deepika Upadhyay <[email protected]>

Co-authored-by: Yuri Shkuro <[email protected]>

Author: Deepika Upadhyay

cmake/Findthrift.cmake

@@ -2,62 +2,62 @@
 
 # - Find Thrift (a cross platform RPC lib/tool)
 # This module defines
-#  THRIFT_VERSION_STRING, version string of ant if found
-#  THRIFT_LIBRARIES, libraries to link
-#  THRIFT_INCLUDE_DIR, where to find THRIFT headers
-#  THRIFT_COMPILER, thrift compiler executable
-#  THRIFT_FOUND, If false, do not try to use ant
+#  thrift_VERSION_STRING, version string of ant if found
+#  thrift_LIBRARIES, libraries to link
+#  thrift_INCLUDE_DIR, where to find thrift headers
+#  thrift_COMPILER, thrift compiler executable
+#  thrift_FOUND, If false, do not try to use ant
 # Function
 #  thrift_gen_cpp(<path to thrift file> <output variable with file list>)
 #
 # Initial work was done by Cloudera https://github.com/cloudera/Impala
 # 2014 - modified by snikulov
 
-# prefer the thrift version supplied in THRIFT_HOME (cmake -DTHRIFT_HOME then environment)
-find_path(THRIFT_INCLUDE_DIR
+# prefer the thrift version supplied in thrift_HOME (cmake -Dthrift_HOME then environment)
+find_path(thrift_INCLUDE_DIR
     NAMES
         thrift/Thrift.h
     HINTS
-        ${THRIFT_HOME}
-        ENV THRIFT_HOME
+        ${thrift_HOME}
+        ENV thrift_HOME
         /usr/local
         /opt/local
     PATH_SUFFIXES
         include
 )
 
-# prefer the thrift version supplied in THRIFT_HOME
-find_library(THRIFT_LIBRARIES
+# prefer the thrift version supplied in thrift_HOME
+find_library(thrift_LIBRARIES
     NAMES
         thrift libthrift
     HINTS
-        ${THRIFT_HOME}
-        ENV THRIFT_HOME
+        ${thrift_HOME}
+        ENV thrift_HOME
         /usr/local
         /opt/local
     PATH_SUFFIXES
         lib lib64
 )
 
-find_program(THRIFT_COMPILER
+find_program(thrift_COMPILER
     NAMES
         thrift
     HINTS
-        ${THRIFT_HOME}
-        ENV THRIFT_HOME
+        ${thrift_HOME}
+        ENV thrift_HOME
         /usr/local
         /opt/local
     PATH_SUFFIXES
         bin bin64
 )
 
-if (THRIFT_COMPILER)
-    exec_program(${THRIFT_COMPILER}
-        ARGS -version OUTPUT_VARIABLE __thrift_OUT RETURN_VALUE THRIFT_RETURN)
-    string(REGEX MATCH "[0-9]+.[0-9]+.[0-9]+-[a-z]+$" THRIFT_VERSION_STRING ${__thrift_OUT})
+if (thrift_COMPILER)
+    exec_program(${thrift_COMPILER}
+        ARGS -version OUTPUT_VARIABLE __thrift_OUT RETURN_VALUE thrift_RETURN)
+    string(REGEX MATCH "[0-9]+.[0-9]+.[0-9]+-[a-z]+$" thrift_VERSION_STRING ${__thrift_OUT})
 
     # define utility function to generate cpp files
-    function(thrift_gen_cpp thrift_file THRIFT_CPP_FILES_LIST THRIFT_GEN_INCLUDE_DIR)
+    function(thrift_gen_cpp thrift_file thrift_CPP_FILES_LIST thrift_GEN_INCLUDE_DIR)
         set(_res)
         set(_res_inc_path)
         if(EXISTS ${thrift_file})
@@ -67,10 +67,10 @@ if (THRIFT_COMPILER)
             if(NOT EXISTS ${CMAKE_BINARY_DIR}/${_target_dir})
                 file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/${_target_dir})
             endif()
-            exec_program(${THRIFT_COMPILER}
+            exec_program(${thrift_COMPILER}
                 ARGS -o "${CMAKE_BINARY_DIR}/${_target_dir}" --gen cpp ${thrift_file}
                 OUTPUT_VARIABLE __thrift_OUT
-                RETURN_VALUE THRIFT_RETURN)
+                RETURN_VALUE thrift_RETURN)
             file(GLOB_RECURSE __result_src "${CMAKE_BINARY_DIR}/${_target_dir}/*.cpp")
             file(GLOB_RECURSE __result_hdr "${CMAKE_BINARY_DIR}/${_target_dir}/*.h")
             list(APPEND _res ${__result_src})
@@ -82,12 +82,12 @@ if (THRIFT_COMPILER)
         else()
             message("thrift_gen_cpp: file ${thrift_file} does not exists")
         endif()
-        set(${THRIFT_CPP_FILES_LIST} "${_res}" PARENT_SCOPE)
-        set(${THRIFT_GEN_INCLUDE_DIR} "${_res_inc_path}" PARENT_SCOPE)
+        set(${thrift_CPP_FILES_LIST} "${_res}" PARENT_SCOPE)
+        set(${thrift_GEN_INCLUDE_DIR} "${_res_inc_path}" PARENT_SCOPE)
     endfunction()
 endif ()
 
 
 include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(THRIFT DEFAULT_MSG THRIFT_LIBRARIES THRIFT_INCLUDE_DIR THRIFT_COMPILER)
-mark_as_advanced(THRIFT_LIBRARIES THRIFT_INCLUDE_DIR THRIFT_COMPILER THRIFT_VERSION_STRING)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(thrift DEFAULT_MSG thrift_LIBRARIES thrift_INCLUDE_DIR thrift_COMPILER)
+mark_as_advanced(thrift_LIBRARIES thrift_INCLUDE_DIR thrift_COMPILER thrift_VERSION_STRING)