Merge branch 'develop'

thejohnfreeman · Oct 6, 2024 · 2e656de · 2e656de
2 parents 5754c51 + a68b0e1
commit 2e656de
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/cmake/cupcake_add_library.cmake b/cmake/cupcake_add_library.cmake
@@ -100,6 +100,7 @@ function(cupcake_add_library name)
     if(NOT type STREQUAL SHARED_LIBRARY)
       # Disable the export definitions.
       string(TOUPPER ${name} UPPER_NAME)
+      string(REPLACE - _ UPPER_NAME ${UPPER_NAME})
       target_compile_definitions(${target} PUBLIC ${UPPER_NAME}_STATIC_DEFINE)
     endif()
   endif()

diff --git a/cmake/cupcake_generate_version_header.cmake b/cmake/cupcake_generate_version_header.cmake
@@ -8,6 +8,7 @@ function(cupcake_generate_version_header name)
     set(ARG_EXPORT_FILE_NAME "${CMAKE_HEADER_OUTPUT_DIRECTORY}/${name}/version.hpp")
   endif()
   string(TOUPPER ${name} UPPER_NAME)
+  string(REPLACE - _ UPPER_NAME ${UPPER_NAME})
   configure_file(
     "${CUPCAKE_MODULE_DIR}/data/version.hpp.in"
     "${ARG_EXPORT_FILE_NAME}"