From 5f54a72317a0ae074582b471f958a9d968dcef25 Mon Sep 17 00:00:00 2001
From: duncanpo <dpo@mathworks.com>
Date: Thu, 23 May 2024 15:59:08 -0400
Subject: [PATCH] minor CMakeLists cleanup

---
 CMakeLists.txt | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 66d5b62..64c5140 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -93,7 +93,7 @@ file(READ ${CMAKE_CURRENT_SOURCE_DIR}/VERSION.txt OTEL_MATLAB_VERSION_RAW)
 string(STRIP ${OTEL_MATLAB_VERSION_RAW} OTEL_MATLAB_VERSION)
 
 
-project(${CLIENT_PROJECT_NAME} VERSION ${OTEL_MATLAB_VERSION})
+project(${CLIENT_PROJECT_NAME} VERSION ${OTEL_MATLAB_VERSION} LANGUAGES CXX)
 
 # ######################################
 # libmexclass 
@@ -312,33 +312,20 @@ endif()
 
 # Additional compiler flags for HTTP/gRPC exporters
 if(WITH_OTLP_HTTP)
-    if(WIN32)
-	set(OTLP_MACROS /DWITH_OTLP_HTTP)
-    else()
-	set(OTLP_MACROS "-D WITH_OTLP_HTTP ")
-    endif()
+    target_compile_definitions(${OPENTELEMETRY_PROXY_LIBRARY_NAME} PRIVATE WITH_OTLP_HTTP)
 endif()
 
 if(WITH_OTLP_GRPC)
-    if(WIN32)
-	set(OTLP_MACROS ${OTLP_MACROS} /DWITH_OTLP_GRPC)
-    else()
-	set(OTLP_MACROS ${OTLP_MACROS} "-D WITH_OTLP_GRPC ")
-    endif()
+    target_compile_definitions(${OPENTELEMETRY_PROXY_LIBRARY_NAME} PRIVATE WITH_OTLP_GRPC)
 endif()
 
+# pass in version number
+target_compile_definitions(${OPENTELEMETRY_PROXY_LIBRARY_NAME} PRIVATE OTEL_MATLAB_VERSION="${OTEL_MATLAB_VERSION}")
 if(WIN32)
     # On Windows, suppress a compiler warning about deprecation of result_of
-    set(CUSTOM_CXX_FLAGS -D_SILENCE_CXX17_RESULT_OF_DEPRECATION_WARNING)
-    # pass in version number
-    set(OTLP_MACROS ${OTLP_MACROS} /DOTEL_MATLAB_VERSION="${OTEL_MATLAB_VERSION}")
-else()
-    set(CUSTOM_CXX_FLAGS "")
-    set(OTLP_MACROS ${OTLP_MACROS} "-D OTEL_MATLAB_VERSION=\"${OTEL_MATLAB_VERSION}\"")
+    target_compile_definitions(${OPENTELEMETRY_PROXY_LIBRARY_NAME} PUBLIC _SILENCE_CXX17_RESULT_OF_DEPRECATION_WARNING)
 endif()
 
-target_compile_options(${OPENTELEMETRY_PROXY_LIBRARY_NAME} PRIVATE ${OTLP_MACROS} ${CUSTOM_CXX_FLAGS})
-
 # link against OpenTelemetry-cpp libraries and their dependencies
 set(OPENTELEMETRY_PROXY_LINK_LIBRARIES ${OTEL_CPP_LIBRARIES} ${Protobuf_LIBRARIES} ${Matlab_MEX_LIBRARY})
 if(WITH_OTLP_HTTP)