Merge pull request #1658 from enetheru/name_clash

CMake: Alleviate target name clashes, visibility, and grouping.

Author: dsnopek

.github/workflows/ci.yml

@@ -202,8 +202,8 @@ jobs:
  run: |
  mkdir cmake-build
  cd cmake-build
- cmake ../ -DTEST_TARGET=template_release
- cmake --build . --verbose -j $(nproc) -t godot-cpp-test --config Release
+ cmake ../ -DGODOT_ENABLE_TESTING=YES
+ cmake --build . --verbose -j $(nproc) -t godot-cpp.test.template_release --config Release
 
  windows-msvc-cmake:
  name: 🏁 Build (Windows, MSVC, CMake)
@@ -218,5 +218,5 @@ jobs:
  run: |
  mkdir cmake-build
  cd cmake-build
- cmake ../ -DTEST_TARGET=template_release
- cmake --build . --verbose -t godot-cpp-test --config Release
+ cmake ../ -DGODOT_ENABLE_TESTING=YES
+ cmake --build . --verbose -t godot-cpp.test.template_release --config Release

CMakeLists.txt

@@ -38,6 +38,7 @@ The CMake equivalent is below.
 ]=======================================================================]
 
 include( cmake/godotcpp.cmake )
+
 godotcpp_options()
 
 #[[ Python is required for code generation ]]
@@ -53,5 +54,12 @@ project( godot-cpp
 compiler_detection()
 godotcpp_generate()
 
-# Test Example
-add_subdirectory( test )
+# Conditionally enable the godot-cpp.test.<target> integration testing targets
+if( GODOT_ENABLE_TESTING )
+ add_subdirectory( test )
+endif()
+
+# If this is the top level CMakeLists.txt, Generators which honor the
+# USE_FOLDERS flag will organize godot-cpp targets under the subfolder
+# 'godot-cpp'. This is enable by default from CMake version 3.26
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)

cmake/android.cmake

@@ -29,13 +29,12 @@ function( android_options )
  # Android Options
 endfunction()
 
-function( android_generate TARGET_NAME )
-
+function( android_generate )
  target_compile_definitions(${TARGET_NAME}
  PUBLIC
  ANDROID_ENABLED
  UNIX_ENABLED
  )
 
- common_compiler_flags( ${TARGET_NAME} )
+ common_compiler_flags()
 endfunction()

cmake/common_compiler_flags.cmake

@@ -44,7 +44,7 @@ function( compiler_detection )
  endif ()
 endfunction( )
 
-function( common_compiler_flags TARGET_NAME )
+function( common_compiler_flags )
 
  target_compile_features(${TARGET_NAME}
  PUBLIC

cmake/godotcpp.cmake

@@ -142,6 +142,9 @@ function( godotcpp_options )
  option( GODOT_SYSTEM_HEADERS "Expose headers as SYSTEM." OFF )
  option( GODOT_WARNING_AS_ERROR "Treat warnings as errors" OFF )
 
+ # Enable Testing
+ option( GODOT_ENABLE_TESTING "Enable the godot-cpp.test.<target> integration testing targets" OFF )
+
  #[[ Target Platform Options ]]
  android_options()
  ios_options()
@@ -228,7 +231,7 @@ function( godotcpp_generate )
  ### Platform is derived from the toolchain target
  # See GeneratorExpressions PLATFORM_ID and CMAKE_SYSTEM_NAME
  set( SYSTEM_NAME
- $<$<PLATFORM_ID:Android>:android.${ANDROID_ABI}>
+ $<$<PLATFORM_ID:Android>:android>
  $<$<PLATFORM_ID:iOS>:ios>
  $<$<PLATFORM_ID:Linux>:linux>
  $<$<PLATFORM_ID:Darwin>:macos>
@@ -263,15 +266,16 @@ function( godotcpp_generate )
  set( DEV_TAG "$<${IS_DEV_BUILD}:.dev>" )
 
  ### Define our godot-cpp library targets
- foreach ( TARGET_NAME template_debug template_release editor )
+ foreach ( TARGET_ALIAS template_debug template_release editor )
+ set( TARGET_NAME "godot-cpp.${TARGET_ALIAS}" )
 
  # Generator Expressions that rely on the target
  set( DEBUG_FEATURES "$<NOT:$<STREQUAL:${TARGET_NAME},template_release>>" )
  set( HOT_RELOAD "$<IF:${HOT_RELOAD-UNSET},${DEBUG_FEATURES},$<BOOL:${GODOT_USE_HOT_RELOAD}>>" )
 
  # the godot-cpp.* library targets
  add_library( ${TARGET_NAME} STATIC EXCLUDE_FROM_ALL )
- add_library( godot-cpp::${TARGET_NAME} ALIAS ${TARGET_NAME} )
+ add_library( godot-cpp::${TARGET_ALIAS} ALIAS ${TARGET_NAME} )
 
  file( GLOB_RECURSE GODOTCPP_SOURCES LIST_DIRECTORIES NO CONFIGURE_DEPENDS src/*.cpp )
 
@@ -298,33 +302,36 @@ function( godotcpp_generate )
  BUILD_RPATH_USE_ORIGIN ON
 
  PREFIX lib
- OUTPUT_NAME "${PROJECT_NAME}.${SYSTEM_NAME}.${TARGET_NAME}${DEV_TAG}.${SYSTEM_ARCH}"
+ OUTPUT_NAME "${PROJECT_NAME}.${SYSTEM_NAME}.${TARGET_ALIAS}${DEV_TAG}.${SYSTEM_ARCH}"
  ARCHIVE_OUTPUT_DIRECTORY "$<1:${CMAKE_BINARY_DIR}/bin>"
 
  # Things that are handy to know for dependent targets
  GODOT_PLATFORM "${SYSTEM_NAME}"
- GODOT_TARGET "${TARGET_NAME}"
+ GODOT_TARGET "${TARGET_ALIAS}"
  GODOT_ARCH "${SYSTEM_ARCH}"
+
+ # Some IDE's respect this property to logically group targets
+ FOLDER "godot-cpp"
  )
 
  if( CMAKE_SYSTEM_NAME STREQUAL Android )
- android_generate( ${TARGET_NAME} )
+ android_generate()
  elseif ( CMAKE_SYSTEM_NAME STREQUAL iOS )
- ios_generate( ${TARGET_NAME} )
+ ios_generate()
  elseif ( CMAKE_SYSTEM_NAME STREQUAL Linux )
- linux_generate( ${TARGET_NAME} )
+ linux_generate()
  elseif ( CMAKE_SYSTEM_NAME STREQUAL Darwin )
- macos_generate( ${TARGET_NAME} )
+ macos_generate()
  elseif ( CMAKE_SYSTEM_NAME STREQUAL Emscripten )
- web_generate( ${TARGET_NAME} )
+ web_generate()
  elseif ( CMAKE_SYSTEM_NAME STREQUAL Windows )
- windows_generate( ${TARGET_NAME} )
+ windows_generate()
  endif ()
 
  endforeach ()
 
  # Added for backwards compatibility with prior cmake solution so that builds dont immediately break
  # from a missing target.
- add_library( godot::cpp ALIAS template_debug )
+ add_library( godot::cpp ALIAS godot-cpp.template_debug )
 
 endfunction()

cmake/ios.cmake

@@ -10,13 +10,12 @@ function(ios_options)
  # iOS options
 endfunction()
 
-function(ios_generate TARGET_NAME)
-
+function(ios_generate)
  target_compile_definitions(${TARGET_NAME}
  PUBLIC
  IOS_ENABLED
  UNIX_ENABLED
  )
 
- common_compiler_flags(${TARGET_NAME})
+ common_compiler_flags()
 endfunction()

cmake/linux.cmake

@@ -10,13 +10,12 @@ function( linux_options )
  # Linux Options
 endfunction()
 
-function( linux_generate TARGET_NAME )
-
+function( linux_generate )
  target_compile_definitions( ${TARGET_NAME}
  PUBLIC
  LINUX_ENABLED
  UNIX_ENABLED
  )
 
- common_compiler_flags( ${TARGET_NAME} )
+ common_compiler_flags()
 endfunction()

cmake/macos.cmake

@@ -23,7 +23,7 @@ function( macos_options )
 endfunction()
 
 
-function( macos_generate TARGET_NAME )
+function( macos_generate )
 
  # OSX_ARCHITECTURES does not support generator expressions.
  if( NOT GODOT_ARCH OR GODOT_ARCH STREQUAL universal )
@@ -55,5 +55,5 @@ function( macos_generate TARGET_NAME )
  ${COCOA_LIBRARY}
  )
 
- common_compiler_flags( ${TARGET_NAME} )
+ common_compiler_flags()
 endfunction()

cmake/web.cmake

@@ -15,8 +15,7 @@ function( web_options )
 endfunction()
 
 
-function( web_generate TARGET_NAME )
-
+function( web_generate )
  target_compile_definitions(${TARGET_NAME}
  PUBLIC
  WEB_ENABLED
@@ -38,5 +37,5 @@ function( web_generate TARGET_NAME )
  -shared
  )
 
- common_compiler_flags( ${TARGET_NAME} )
+ common_compiler_flags()
 endfunction()

cmake/windows.cmake

@@ -58,7 +58,7 @@ function( windows_options )
 endfunction()
 
 #[===========================[ Target Generation ]===========================]
-function( windows_generate TARGET_NAME )
+function( windows_generate )
  set( STATIC_CPP "$<BOOL:${GODOT_USE_STATIC_CPP}>")
  set( DEBUG_CRT "$<BOOL:${GODOT_DEBUG_CRT}>" )
 
@@ -96,5 +96,5 @@ function( windows_generate TARGET_NAME )
  $<${IS_CLANG}:-lstdc++>
  )
 
- common_compiler_flags( ${TARGET_NAME} )
+ common_compiler_flags()
 endfunction()