Skip to content

Commit 670e843

Browse files
committed
fix so package isnt built from source
build from the project that we install the files to instead of the source
1 parent 9756517 commit 670e843

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

Assets/FbxExporters/README.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Copyright (c) 2017 Unity Technologies. All rights reserved.
44

55
See LICENSE.txt file for full license information.
66

7-
**Version**: 0.0.14a
7+
VERSION: sprint26
88

99
Requirements
1010
------------

CMakeLists.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ add_custom_target(
103103
"VERSION: ${PACKAGE_VERSION}"
104104
COMMAND ${PYTHON_EXECUTABLE}
105105
"${CMAKE_SOURCE_DIR}/scripts/file-search-replace.py"
106-
"${CMAKE_SOURCE_DIR}/Assets/Integrations/Autodesk/maya/scripts/unityOneClick/version.py"
106+
"${CMAKE_SOURCE_DIR}/Assets/FbxExporters/Integrations/Autodesk/maya/scripts/unityOneClick/version.py"
107107
".*VERSION.*=.*"
108108
"VERSION = '${PACKAGE_VERSION}'"
109109
DEPENDS "${CMAKE_SOURCE_DIR}/scripts/file-search-replace.py"
@@ -170,11 +170,12 @@ endif()
170170
# Add target for creating a package
171171
add_custom_command(
172172
OUTPUT ${PACKAGE_PATH}
173-
COMMAND "${UNITY_EDITOR_PATH}" -batchmode -projectPath ${CMAKE_SOURCE_DIR} -exportPackage Assets/FbxExporters ${PACKAGE_PATH} -quit
173+
COMMAND "${CMAKE_COMMAND}" --build . --target install --config Release
174+
COMMAND "${UNITY_EDITOR_PATH}" -batchmode -projectPath ${CMAKE_BINARY_DIR}/FbxExporterProject -exportPackage Assets/FbxExporters ${PACKAGE_PATH} -quit
174175
COMMENT "Creating Unity Package ${PACKAGE_PATH}"
175-
DEPENDS ${MAYA_INTEGRATION_TARGET}
176+
DEPENDS UnityFbxExporterEditorDLL
176177
)
177-
add_custom_target(unitypackage DEPENDS ${PACKAGE_PATH} ${FBXSDK_PACKAGE_TARGET} ${MAYA_INTEGRATION_TARGET} ${README_TARGET})
178+
add_custom_target(unitypackage DEPENDS ${PACKAGE_PATH} ${FBXSDK_PACKAGE_TARGET} ${README_TARGET})
178179

179180
enable_testing()
180181
add_test(NAME run-all COMMAND "${UNITY_EDITOR_PATH}" -batchmode -projectPath ${CMAKE_SOURCE_DIR} runEditorTests -quit)

scripts/file-search-replace.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@
3535
data=re.sub(searchstr, replacestr, data, 1, re.IGNORECASE)
3636
filein.seek(0)
3737
filein.write(data)
38-
filein.truncate()
38+
filein.truncate()

0 commit comments

Comments
 (0)