Update godot_headers after we discovered an upstream issue

Using godot_headers that is in sync with Godot 3.1.1
Merge pull request #263 from underdoeg/patch-1
2026-01-01 05:48:37 +03:00 · 2019-05-02 22:55:31 +10:00 · 2019-05-02 21:43:14 +10:00 · 2019-04-12 22:25:12 +10:00 · 2019-04-11 11:56:42 +02:00
2 changed files with 3 additions and 3 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -133,7 +133,7 @@ endif()
 # Generate source from the bindings file
 message(STATUS "Generating Bindings")
 execute_process(COMMAND "python" "-c" "import binding_generator; binding_generator.generate_bindings(\"${GODOT_CUSTOM_API_FILE}\")"
-	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+	WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 	RESULT_VARIABLE GENERATION_RESULT
 	OUTPUT_VARIABLE GENERATION_OUTPUT)
 message(STATUS ${GENERATION_RESULT} ${GENERATION_OUTPUT})
@@ -145,7 +145,7 @@ file(GLOB_RECURSE HEADERS include/*.h**)
 # Define our godot-cpp library
 add_library(${PROJECT_NAME} ${SOURCES} ${HEADERS})
 target_include_directories(${PROJECT_NAME}
-	PRIVATE
+	PUBLIC
 	include
 	include/core
 	include/gen
--- a/2
+++ b/2
Author	SHA1	Message	Date
Bastiaan Olij	e4ad265339	Update godot_headers after we discovered an upstream issue	2019-05-02 22:55:31 +10:00
Bastiaan Olij	9bebf4feb7	Using godot_headers that is in sync with Godot 3.1.1	2019-05-02 21:43:14 +10:00
Bastiaan Olij	7e8c24f0ac	Merge pull request #263 from underdoeg/patch-1 changes to cmake file so it can be used as a subdirectory	2019-04-12 22:25:12 +10:00
Philip Whitfield	468dab8f01	Update CMakeLists.txt changes so this cmake file can be used as a subdirectory ``` add_subdirectory(godot-cpp) project(project-name) add_library(project-name SHARED src/init.cpp) target_link_libraries(project-name godot-cpp) ```	2019-04-11 11:56:42 +02:00