lang: change library macros to add sourcepp prefix, fix wasm variable names

Author: craftablescience

cmake/AddSourcePPLibrary.cmake

@@ -24,21 +24,16 @@ function(add_sourcepp_library TARGET)
             add_custom_command(TARGET sourcepp::${TARGET}c POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_BINARY_DIR}/sourcepp_${TARGET}c${CMAKE_SHARED_LIBRARY_SUFFIX}" "${CMAKE_CURRENT_SOURCE_DIR}/lang/csharp/src/${TARGET}")
         endif()
 
-        # Add Python
-        if(SOURCEPP_BUILD_PYTHON_WRAPPERS AND OPTIONS_PYTHON)
-            list(APPEND ${${PROJECT_NAME}_PYTHON}_DEPS sourcepp::${TARGET})
-            list(APPEND ${${PROJECT_NAME}_PYTHON}_DEFINES ${TARGET_UPPER})
-            list(APPEND ${${PROJECT_NAME}_PYTHON}_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/lang/python/src/${TARGET}.h")
-            list(APPEND PROPAGATE_VARS ${${PROJECT_NAME}_PYTHON}_DEPS ${${PROJECT_NAME}_PYTHON}_DEFINES ${${PROJECT_NAME}_PYTHON}_SOURCES)
-        endif()
-
-        # Add WASM
-        if(SOURCEPP_BUILD_WASM_WRAPPERS AND OPTIONS_WASM)
-            list(APPEND ${${PROJECT_NAME}_WASM}_DEPS sourcepp::${TARGET})
-            list(APPEND ${${PROJECT_NAME}_WASM}_DEFINES ${TARGET_UPPER})
-            list(APPEND ${${PROJECT_NAME}_WASM}_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/lang/wasm/src/${TARGET}.h")
-            list(APPEND PROPAGATE_VARS ${${PROJECT_NAME}_WASM}_DEPS ${${PROJECT_NAME}_WASM}_DEFINES ${${PROJECT_NAME}_WASM}_SOURCES)
-        endif()
+        # Add Python, WASM
+        foreach(LANGUAGE "PYTHON" "WASM")
+            if(SOURCEPP_BUILD_${LANGUAGE}_WRAPPERS AND OPTIONS_${LANGUAGE})
+                string(TOLOWER "${LANGUAGE}" LANGUAGE_LOWER)
+                list(APPEND ${${PROJECT_NAME}_${LANGUAGE}}_DEPS sourcepp::${TARGET})
+                list(APPEND ${${PROJECT_NAME}_${LANGUAGE}}_DEFINES "SOURCEPP_${TARGET_UPPER}")
+                list(APPEND ${${PROJECT_NAME}_${LANGUAGE}}_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/lang/${LANGUAGE_LOWER}/src/${TARGET}.h")
+                list(APPEND PROPAGATE_VARS ${${PROJECT_NAME}_${LANGUAGE}}_DEPS ${${PROJECT_NAME}_${LANGUAGE}}_DEFINES ${${PROJECT_NAME}_${LANGUAGE}}_SOURCES)
+            endif()
+        endforeach()
 
         # Add tests
         if(SOURCEPP_BUILD_TESTS AND OPTIONS_TEST)

lang/_lang.cmake

@@ -40,8 +40,9 @@ macro(sourcepp_lang_setup_pre)
     # WASM bindings (pre)
     if(SOURCEPP_BUILD_WASM_WRAPPERS)
         set(${PROJECT_NAME}_WASM "${PROJECT_NAME}_wasm")
-        set(${${PROJECT_NAME}_PYTHON}_SOURCES "")
-        set(${${PROJECT_NAME}_PYTHON}_DEFINES "")
+        set(${${PROJECT_NAME}_WASM}_DEPS    "")
+        set(${${PROJECT_NAME}_WASM}_SOURCES "")
+        set(${${PROJECT_NAME}_WASM}_DEFINES "")
     endif()
 endmacro()
 

lang/python/src/sourcepp.cpp

@@ -1,34 +1,34 @@
 #include "sourcepp.h"
 
-#ifdef BSPPP
+#ifdef SOURCEPP_BSPPP
 #include "bsppp.h"
 #endif
 
-#ifdef GAMEPP
+#ifdef SOURCEPP_GAMEPP
 #include "gamepp.h"
 #endif
 
-#ifdef KVPP
+#ifdef SOURCEPP_KVPP
 #include "kvpp.h"
 #endif
 
-#ifdef STEAMPP
+#ifdef SOURCEPP_STEAMPP
 #include "steampp.h"
 #endif
 
-#ifdef TOOLPP
+#ifdef SOURCEPP_TOOLPP
 #include "toolpp.h"
 #endif
 
-#ifdef VCRYPTPP
+#ifdef SOURCEPP_VCRYPTPP
 #include "vcryptpp.h"
 #endif
 
-#ifdef VPKPP
+#ifdef SOURCEPP_VPKPP
 #include "vpkpp.h"
 #endif
 
-#ifdef VTFPP
+#ifdef SOURCEPP_VTFPP
 #include "vtfpp.h"
 #endif
 
@@ -37,35 +37,35 @@ NB_MODULE(_sourcepp_impl, m) {
 
 	sourcepp::register_python(m);
 
-#ifdef GAMEPP
+#ifdef SOURCEPP_GAMEPP
 	gamepp::register_python(m);
 #endif
 
-#ifdef KVPP
+#ifdef SOURCEPP_KVPP
 	kvpp::register_python(m);
 #endif
 
-#ifdef STEAMPP
+#ifdef SOURCEPP_STEAMPP
 	steampp::register_python(m);
 #endif
 
-#ifdef TOOLPP
+#ifdef SOURCEPP_TOOLPP
 	toolpp::register_python(m);
 #endif
 
-#ifdef VCRYPTPP
+#ifdef SOURCEPP_VCRYPTPP
 	vcryptpp::register_python(m);
 #endif
 
-#ifdef VPKPP
+#ifdef SOURCEPP_VPKPP
 	vpkpp::register_python(m);
 #endif
 
-#ifdef BSPPP
+#ifdef SOURCEPP_BSPPP
 	bsppp::register_python(m);
 #endif
 
-#ifdef VTFPP
+#ifdef SOURCEPP_VTFPP
 	vtfpp::register_python(m);
 #endif
 }