Updated target properties

- Added CXX_STANDARD 17
- Added POSITION_INDEPENDENT_CODE ON
- Added BUILDRPTH_USE_ORIGIN ON
Changed python command to use single quotes to make build output log more legible.
removed manual rpath origin from link options
prevent use of -static-libgcc on APPLE platform
Re-Arranged initial cmake file to allow options before project command, specifically CMAKE_BUILD_TYPE as the default should be Release unless DEV_BUILD is enabled.
Added GODOT_DEV_BUILD to allow differentiation of debug or Release builds.
Removed manual link options for test target
Updated test target properties
- Added CXX_STANDARD 17
- Added CXX_VISIBILITY_PRESET
- Added LINK_SEARCH_START_STATIC
- Added LINK_SEARCH_END_STATIC
- Added to .gitignore CMakeUserPresets.json

Author: enetheru

.gitignore

@@ -199,3 +199,6 @@ venv
 # Clion Configuration
 .idea/
 cmake-build-*
+
+# CMake related
+CMakeUserPresets.json

CMakeLists.txt

@@ -1,23 +1,32 @@
 cmake_minimum_required(VERSION 3.13)
-project(godot-cpp LANGUAGES CXX)
 
-# Get Python
-find_package(Python3 3.4 REQUIRED) # pathlib should be present
+# As we are attempting to maintain feature parity, and ease of maintenance,
+# these CMake scripts are built to resemble the structure of the SCons build system.
+# The closer the two build systems look the easier they will be to maintain.
 
-if( CMAKE_C_COMPILER)
-    #Silence warning from unused CMAKE_C_COMPILER from toolchain
-endif ()
+# include pulls in the code from godotcpp.cmake
+# the equivalent in scons:
+#   cpp_tool = Tool("godotcpp", toolpath=["tools"])
+include( ${CMAKE_SOURCE_DIR}/cmake/godotcpp.cmake )
 
-# Main Library
-include( ${PROJECT_SOURCE_DIR}/cmake/godotcpp.cmake )
+godotcpp_options()
 
-# I know this doesn't look like a typical CMakeLists.txt, but as we are
-# attempting mostly feature parity with SCons, and easy maintenance, the closer
-# the two build systems look the easier they will be to keep in lockstep.
+# godot-cpp targets three main configurations, editor, template_release and template_debug.
+# These are all built in "Release" mode unless GODOT_DEV_BUILD is enabled, then the build type is "Debug".
+get_property( IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG )
+if( NOT IS_MULTI_CONFIG AND NOT CMAKE_BUILD_TYPE )
+    if( GODOT_DEV_BUILD )
+        set( CMAKE_BUILD_TYPE "Debug" )
+    else ()
+        set( CMAKE_BUILD_TYPE "Release" )
+    endif ()
+endif ()
 
-# The typical target definitions are in ${PROJECT_SOURCE_DIR}/cmake/godotcpp.cmake
+# Get Python
+find_package(Python3 3.4 REQUIRED) # pathlib should be present
 
-godotcpp_options()
+# Define our project.
+project(godot-cpp LANGUAGES CXX)
 
 godotcpp_generate()
 

cmake/common_compiler_flags.cmake

@@ -121,15 +121,12 @@ target_compile_definitions(${PROJECT_NAME}
         $<$<STREQUAL:${GODOT_PRECISION},double>:REAL_T_IS_DOUBLE>
 )
 
-target_link_options(${PROJECT_NAME} PRIVATE
-    $<$<OR:${IS_CLANG},${IS_GNU}>:
-        -static-libgcc
-        -static-libstdc++
-    >
-
-    $<$<PLATFORM_ID:Linux>:
-        $<${IS_GNU}:
-            -Wl,-R,'$$ORIGIN'
+# godot-cpp is a static archive, so there is no link step.
+# However, I can save consumers some build configuration steps by propagating static linking to libc
+target_link_options(${PROJECT_NAME}
+    PUBLIC
+        $<$<OR:${IS_CLANG},${IS_GNU}>:
+            $<$<NOT:$<BOOL:${APPLE}>>:-static-libgcc>
+            -static-libstdc++
         >
-    >
 )

cmake/godotcpp.cmake

@@ -38,7 +38,7 @@ function( godotcpp_options )
 
     #TODO optimize
     #TODO debug_symbols
-    #TODO dev_build
+    option( GODOT_DEV_BUILD "Developer build with dev-only debugging code (DEV_ENABLED)" OFF )
 
     # FIXME These options are not present in SCons, and perhaps should be added there.
     option(GODOT_SYSTEM_HEADERS "Expose headers as SYSTEM." ON)
@@ -87,14 +87,14 @@ function( godotcpp_generate )
         set(GENERATE_BINDING_PARAMETERS "False")
     endif()
 
-    execute_process(COMMAND "${Python3_EXECUTABLE}" "-c" "import binding_generator; binding_generator.print_file_list(\"${GODOT_GDEXTENSION_API_FILE}\", \"${CMAKE_CURRENT_BINARY_DIR}\", headers=True, sources=True)"
+    execute_process(COMMAND "${Python3_EXECUTABLE}" "-c" "import binding_generator; binding_generator.print_file_list('${GODOT_GDEXTENSION_API_FILE}', '${CMAKE_CURRENT_BINARY_DIR}', headers=True, sources=True)"
             WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
             OUTPUT_VARIABLE GENERATED_FILES_LIST
             OUTPUT_STRIP_TRAILING_WHITESPACE
     )
 
     add_custom_command(OUTPUT ${GENERATED_FILES_LIST}
-            COMMAND "${Python3_EXECUTABLE}" "-c" "import binding_generator; binding_generator.generate_bindings(\"${GODOT_GDEXTENSION_API_FILE}\", \"${GENERATE_BINDING_PARAMETERS}\", \"${BITS}\", \"${GODOT_PRECISION}\", \"${CMAKE_CURRENT_BINARY_DIR}\")"
+            COMMAND "${Python3_EXECUTABLE}" "-c" "import binding_generator; binding_generator.generate_bindings('${GODOT_GDEXTENSION_API_FILE}', '${GENERATE_BINDING_PARAMETERS}', '${BITS}', '${GODOT_PRECISION}', '${CMAKE_CURRENT_BINARY_DIR}')"
             VERBATIM
             WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
             MAIN_DEPENDENCY ${GODOT_GDEXTENSION_API_FILE}
@@ -150,9 +150,11 @@ function( godotcpp_generate )
 
     set_target_properties( ${PROJECT_NAME}
             PROPERTIES
+            CXX_STANDARD 17
             CXX_EXTENSIONS OFF
-            POSITION_INDEPENDENT_CODE ON
             CXX_VISIBILITY_PRESET ${GODOT_SYMBOL_VISIBILITY}
+            POSITION_INDEPENDENT_CODE ON
+            BUILD_RPATH_USE_ORIGIN ON
             ARCHIVE_OUTPUT_DIRECTORY "$<1:${CMAKE_SOURCE_DIR}/bin>"
             PDB_OUTPUT_DIRECTORY "$<1:${CMAKE_SOURCE_DIR}/bin>"
             PREFIX lib

doc/cmake.md

@@ -218,7 +218,7 @@ Info on cross compiling triplets indicates that the naming is a little more free
 Untested
 
 ### MacOS Host
-Untested
+tested on a mac mini, but I have to check the target triplet.
 
 ### Windows Host
 

test/CMakeLists.txt

@@ -24,18 +24,6 @@ target_compile_options( godot-cpp-test
         >
 )
 
-target_link_options( godot-cpp-test
-        PRIVATE
-        $<$<OR:${IS_CLANG},${IS_GNU}>:
-            -static-libgcc
-            -static-libstdc++
-        >
-        $<$<PLATFORM_ID:Linux>:
-            $<${IS_GNU}:
-                -Wl,-R,'$$ORIGIN'
-            >
-        >
-)
 
 ### Create the correct name (name.os.build_type.arch)
 set( ARCH_KEYS "w64;x86_64;amd64" )
@@ -52,10 +40,13 @@ set( SYSTEM_NAME "$<LOWER_CASE:${CMAKE_SYSTEM_NAME}>$<$<BOOL:${ANDROID}>:.${ANDR
 
 set_target_properties( godot-cpp-test
         PROPERTIES
+        CXX_STANDARD 17
         CXX_EXTENSIONS OFF
+        CXX_VISIBILITY_PRESET ${GODOT_SYMBOL_VISIBILITY}
         POSITION_INDEPENDENT_CODE ON
         BUILD_RPATH_USE_ORIGIN ON
-        CXX_VISIBILITY_PRESET ${GODOT_SYMBOL_VISIBILITY}
+        LINK_SEARCH_START_STATIC ON
+        LINK_SEARCH_END_STATIC ON
         LIBRARY_OUTPUT_DIRECTORY "$<1:${CMAKE_CURRENT_SOURCE_DIR}/project/bin/>"
         RUNTIME_OUTPUT_DIRECTORY "$<1:${CMAKE_CURRENT_SOURCE_DIR}/project/bin/>"
         PDB_OUTPUT_DIRECTORY "$<1:${CMAKE_CURRENT_SOURCE_DIR}/project/bin/>"