birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7731 from aws-lumberyard-dev/cgalvan/FixedToolGemplates

Browse Source 
Updated deprecated CMake function usage in PythonToolGem and CppToolGem templates
This commit is contained in:
Chris Galvan
2022-02-18 10:14:51 -06:00
committed by GitHub
parent 669caca9cc 26190a47eb
commit c6ca903e5f
5 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Templates/CppToolGem/Template/CMakeLists.txt
+4 -5
View File
@@ -6,12 +6,11 @@
# #
# {END_LICENSE} # {END_LICENSE}
set(o3de_gem_path ${CMAKE_CURRENT_LIST_DIR}) set(gem_path ${CMAKE_CURRENT_LIST_DIR})
set(o3de_gem_json ${o3de_gem_path}/gem.json) set(gem_json ${gem_path}/gem.json)
o3de_read_json_key(o3de_gem_name ${o3de_gem_json} "gem_name") o3de_restricted_path(${gem_json} gem_restricted_path gem_parent_relative_path)
o3de_restricted_path(${o3de_gem_json} o3de_gem_restricted_path)
ly_get_list_relative_pal_filename(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME} "${o3de_gem_restricted_path}" ${o3de_gem_path} ${o3de_gem_name}) o3de_pal_dir(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME} "${gem_restricted_path}" "${gem_path}" "${gem_parent_relative_path}")
# Now that we have the platform abstraction layer (PAL) folder for this folder, thats where we will find the # Now that we have the platform abstraction layer (PAL) folder for this folder, thats where we will find the
# project cmake for this platform. # project cmake for this platform.
Templates/CppToolGem/Template/Code/CMakeLists.txt
+2 -2
View File
@@ -8,11 +8,11 @@
# Currently we are in the Code folder: ${CMAKE_CURRENT_LIST_DIR} # Currently we are in the Code folder: ${CMAKE_CURRENT_LIST_DIR}
# Get the platform specific folder ${pal_dir} for the current folder: ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME} # Get the platform specific folder ${pal_dir} for the current folder: ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME}
# Note: ly_get_list_relative_pal_filename will take care of the details for us, as this may be a restricted platform # Note: o3de_pal_dir will take care of the details for us, as this may be a restricted platform
# in which case it will see if that platform is present here or in the restricted folder. # in which case it will see if that platform is present here or in the restricted folder.
# i.e. It could here in our gem : Gems/${Name}/Code/Platform/<platorm_name> or # i.e. It could here in our gem : Gems/${Name}/Code/Platform/<platorm_name> or
# <restricted_folder>/<platform_name>/Gems/${Name}/Code # <restricted_folder>/<platform_name>/Gems/${Name}/Code
ly_get_list_relative_pal_filename(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME} ${o3de_gem_restricted_path} ${o3de_gem_path} ${o3de_gem_name}) o3de_pal_dir(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME} "${gem_restricted_path}" "${gem_path}" "${gem_name}")
# Now that we have the platform abstraction layer (PAL) folder for this folder, thats where we will find the # Now that we have the platform abstraction layer (PAL) folder for this folder, thats where we will find the
# traits for this platform. Traits for a platform are defines for things like whether or not something in this gem # traits for this platform. Traits for a platform are defines for things like whether or not something in this gem
Templates/CppToolGem/Template/Code/Source/${Name}Widget.cpp
+1 -1
View File
@@ -26,7 +26,7 @@ namespace ${SanitizedCppName}
mainLayout->addWidget(introLabel, 0, Qt::AlignCenter); mainLayout->addWidget(introLabel, 0, Qt::AlignCenter);
QString helpText = QString( QString helpText = QString(
"For help getting started, visit the <a href=\"https://o3de.org/docs/tools-ui/ui-dev-intro/\">UI Development</a> documentation<br/>or come ask a question in the <a href=\"https://discord.gg/R77Wss3kHe\">sig-ui-ux channel</a> on Discord"); "For help getting started, visit the <a href=\"https://o3de.org/docs/tools-ui/\">UI Development</a> documentation<br/>or come ask a question in the <a href=\"https://discord.gg/R77Wss3kHe\">sig-ui-ux channel</a> on Discord");
QLabel* helpLabel = new QLabel(this); QLabel* helpLabel = new QLabel(this);
helpLabel->setTextFormat(Qt::RichText); helpLabel->setTextFormat(Qt::RichText);
Templates/PythonToolGem/Template/Code/CMakeLists.txt
+2 -2
View File
@@ -8,11 +8,11 @@
# Currently we are in the Code folder: ${CMAKE_CURRENT_LIST_DIR} # Currently we are in the Code folder: ${CMAKE_CURRENT_LIST_DIR}
# Get the platform specific folder ${pal_dir} for the current folder: ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME} # Get the platform specific folder ${pal_dir} for the current folder: ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME}
# Note: ly_get_list_relative_pal_filename will take care of the details for us, as this may be a restricted platform # Note: o3de_pal_dir will take care of the details for us, as this may be a restricted platform
# in which case it will see if that platform is present here or in the restricted folder. # in which case it will see if that platform is present here or in the restricted folder.
# i.e. It could here in our gem : Gems/${Name}/Code/Platform/<platorm_name> or # i.e. It could here in our gem : Gems/${Name}/Code/Platform/<platorm_name> or
# <restricted_folder>/<platform_name>/Gems/${Name}/Code # <restricted_folder>/<platform_name>/Gems/${Name}/Code
ly_get_list_relative_pal_filename(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME} ${o3de_gem_restricted_path} ${o3de_gem_path} ${o3de_gem_name}) o3de_pal_dir(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME} "${gem_restricted_path}" "${gem_path}" "${gem_name}")
# Now that we have the platform abstraction layer (PAL) folder for this folder, thats where we will find the # Now that we have the platform abstraction layer (PAL) folder for this folder, thats where we will find the
# traits for this platform. Traits for a platform are defines for things like whether or not something in this gem # traits for this platform. Traits for a platform are defines for things like whether or not something in this gem
Templates/PythonToolGem/Template/Editor/Scripts/${NameLower}_dialog.py
+1 -1
View File
@@ -22,7 +22,7 @@ class ${SanitizedCppName}Dialog(QDialog):
self.mainLayout.addWidget(self.introLabel, 0, Qt.AlignCenter) self.mainLayout.addWidget(self.introLabel, 0, Qt.AlignCenter)
self.helpText = str("For help getting started," self.helpText = str("For help getting started,"
"visit the <a href=\"https://o3de.org/docs/tools-ui/ui-dev-intro/\">UI Development</a> documentation<br/>" "visit the <a href=\"https://o3de.org/docs/tools-ui/\">UI Development</a> documentation<br/>"
"or come ask a question in the <a href=\"https://discord.gg/R77Wss3kHe\">sig-ui-ux channel</a> on Discord") "or come ask a question in the <a href=\"https://discord.gg/R77Wss3kHe\">sig-ui-ux channel</a> on Discord")
self.helpLabel = QLabel() self.helpLabel = QLabel()