Working SCons/CMake config function, TODO detach from godot-cpp

Author: Vano

CMakeLists.txt

@@ -75,17 +75,7 @@ include(godot-cppscript)
 # Get header files (.hpp only)
 file(GLOB_RECURSE CPPSCRIPT_HEADERS ../src/*.hpp)
 
-# Optional
-
-# C++ defines (TOOLS_ENABLED, DEBUG_METHODS etc.)
-# enable, if you conditionally enable classes/members
-# based on definitions
-#get_target_property(DEFS ${PROJECT_NAME} COMPILE_DEFINITIONS)
-
-# Include paths
-# (try to avoid godot-cpp headers paths,
-# it slows parsing drastically)
-#get_target_property(INC_PATHS ${PROJECT_NAME} INCLUDE_DIRECTORIES)
+# Call function to configure your target
 create_cppscript_target(
 	# Name of your main target
 	${PROJECT_NAME}
@@ -105,8 +95,16 @@ create_cppscript_target(
 	ON
 
 	# Optional
-	""	# OR "${INC_PATHS}"
-	""	# OR "${DEFS}"
+
+	# C++ defines (TOOLS_ENABLED, DEBUG_METHODS etc.)
+	# Enable, if you conditionally enable classes/members
+	# based on definitions
+	"" # $<TARGET_PROPERTY:godot-cpp,COMPILE_DEFINITIONS>
+
+	# Include paths
+	# (Try to avoid godot-cpp headers paths,
+	# it slows parsing drastically)
+	"" # $<TARGET_PROPERTY:${PROJECT_NAME},INCLUDE_DIRECTORIES>
 )
 ###############################
 

SConstruct

@@ -34,12 +34,12 @@ generated = create_cppscript_target(
 		# Optional
 
 		## C++ defines (TOOLS_ENABLED, DEBUG_METHODS etc.)
-		## enable, if you conditionally enable classes/members
+		## Enable, if you conditionally enable classes/members
 		## based on definitions
 		#'compile_defs' : env['CPPDEFINES'],
 		#
 		## Include paths
-		## (try to avoid godot-cpp headers paths,
+		## (Try to avoid godot-cpp headers paths,
 		## it slows parsing drastically)
 		#'include_paths' : env['CPPPATH']
 		}

cmake/godot-cppscript.cmake

@@ -3,14 +3,15 @@ find_package(Python3 3.4 REQUIRED)
 set(CPPSCRIPT_DIR ${CMAKE_CURRENT_LIST_DIR}/..)
 
 #TODO: make it work in parallel
-function(create_cppscript_target TARGET_NAME HEADER_NAME HEADERS_DIR GEN_DIR AUTO_METHODS INCLUDE_PATHS COMPILE_DEFS)
-	# Handle empty lists
-	if("${COMPILE_DEFS}" STREQUAL "DEFS-NOTFOUND")
-		set(COMPILE_DEFS "")
-	endif()
-	if("${INCLUDE_PATHS}" STREQUAL "INC_PATHS-NOTFOUND")
+function(create_cppscript_target TARGET_NAME HEADER_NAME HEADERS_DIR GEN_DIR AUTO_METHODS COMPILE_DEFS INCLUDE_PATHS)
+	# Handle empty/NOTFOUND lists
+	if(NOT INCLUDE_PATHS)
 		set(INCLUDE_PATHS "")
 	endif()
+	if(NOT COMPILE_DEFS)
+		set(COMPILE_DEFS "")
+	endif()
+
 
 	if(${AUTO_METHODS})
 		set(AUTO_METHODS_STR "True")
@@ -46,6 +47,7 @@ function(create_cppscript_target TARGET_NAME HEADER_NAME HEADERS_DIR GEN_DIR AUT
 		DEPENDS ${CPPSCRIPT_HEADERS}
 		WORKING_DIRECTORY ${CPPSCRIPT_DIR}
 		VERBATIM
+		COMMAND_EXPAND_LISTS
 		COMMENT "Parsing header files..."
 	)
 

cppscript.py

@@ -23,8 +23,8 @@ def __call__(self, scons_env, source, call_args, *args, **kwargs):
 					'header_name' : env['header_name'],
 					'header_dir' : env['header_dir'],
 					'gen_dir' : env['gen_dir'],
-					'compile_defs' : [f'{i[0]}={i[1]}' if type(i) is tuple else str(i) for i in env.get('compile_defs', [])],
-					'include_paths' : [cppscript_src] + env.get('include_paths', []),
+					'compile_defs' : {f'{i[0]}={i[1]}' if type(i) is tuple else str(i) for i in env.get('compile_defs', [])},
+					'include_paths' : {cppscript_src}.union({str(path) for path in env.get('include_paths', [])}),
 					'auto_methods' : env['auto_methods']
 				}
 
@@ -190,10 +190,12 @@ def generate_header_emitter(target, source, env):
 
 
 def generate_header_scons(target, source, env):
+	print(json.dumps(env['cppscript_env'], indent=2, default=lambda x: list(x) if type(x) is set else None))
 	return generate_header(source, env['cppscript_env'], get_file_scons)
 
 
 def generate_header_cmake(source, env):
+	print(json.dumps(env, indent=2, default=lambda x: list(x) if type(x) is set else x))
 	return generate_header(source, env, get_file_cmake)
 
 

cppscript_bindings.py

@@ -21,8 +21,8 @@
 	'header_name' : args.header_name[0],
 	'header_dir' : args.header_dir[0],
 	'gen_dir' : args.gen_dir[0],
-	'compile_defs' : args.definitions,
-	'include_paths' :  args.include_paths,
+	'compile_defs' : set(args.definitions),
+	'include_paths' :  set(args.include_paths),
 	'auto_methods' : args.auto_methods
 }
 

src/register_types.h

@@ -3,10 +3,6 @@
 #define REGISTER_TYPES_H
 
 #include <godot_cpp/core/class_db.hpp>
-#include <godot_cpp/classes/multiplayer_api.hpp>
-#include <godot_cpp/classes/multiplayer_peer.hpp>
-
-#include "scripts.gen.h"
 
 using namespace godot;