Merge pull request #458 from Unity-Technologies/markv/inplace-build

build in-place in com.unity.formats.fbx instead of build/install

Author: mjmvisser

.gitignore

@@ -74,3 +74,10 @@ TestProjects/FbxTests/Assets/Plugins*
 FbxExportSettings.asset
 **/ValidationSuiteResults/**
 TestProjects/FbxTests/Logs/*
+
+# Generated by build install
+com.unity.formats.fbx/Editor/Integrations~/**
+com.unity.formats.fbx/CHANGELOG.md
+com.unity.formats.fbx/LICENSE.md
+com.unity.formats.fbx/package.json
+

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required (VERSION 3.8)
 
-SET(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install" CACHE PATH "Install path prefix")
+SET(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}" CACHE PATH "Install path prefix")
 MESSAGE(STATUS "CMAKE_INSTALL_PREFIX is: " ${CMAKE_INSTALL_PREFIX})
 
 project (UnityFbxExporterEditorPackage NONE)
@@ -25,7 +25,7 @@ execute_process(COMMAND ${GIT_EXECUTABLE} config --get remote.origin.url
         OUTPUT_VARIABLE PACKAGE_REPO_URL
         OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-configure_file(${CMAKE_SOURCE_DIR}/proto.com.unity.formats.fbx/package.json.in ${CMAKE_BINARY_DIR}/package.json @ONLY)
+configure_file(${CMAKE_SOURCE_DIR}/package.json.in ${CMAKE_BINARY_DIR}/package.json @ONLY)
 
 ###########################################################################
 # Zip integrations folder
@@ -78,11 +78,6 @@ add_custom_target(${MAX_INTEGRATION_ZIP_TARGET} ALL DEPENDS ${MAX_INTEGRATION_ZI
 ############################################################################
 # Install project into build folder
 
-install(
-    DIRECTORY "${CMAKE_SOURCE_DIR}/proto.com.unity.formats.fbx/"
-    DESTINATION "${CMAKE_INSTALL_PREFIX}/com.unity.formats.fbx"
-    PATTERN "*.in" EXCLUDE
-)
 install(
     FILES "${CMAKE_BINARY_DIR}/${MAYA_INTEGRATION_ZIP_NAME}" "${CMAKE_BINARY_DIR}/${MAX_INTEGRATION_ZIP_NAME}"
     DESTINATION "${CMAKE_INSTALL_PREFIX}/com.unity.formats.fbx/Editor/Integrations~"
@@ -91,3 +86,4 @@ install(
     FILES "${CMAKE_SOURCE_DIR}/CHANGELOG.md" "${CMAKE_SOURCE_DIR}/LICENSE.md" "${CMAKE_BINARY_DIR}/package.json"
     DESTINATION "${CMAKE_INSTALL_PREFIX}/com.unity.formats.fbx"
 )
+

TestProjects/FbxTests/Packages/manifest.json

@@ -3,7 +3,7 @@
     "com.unity.ads": "2.0.8",
     "com.unity.analytics": "3.2.2",
     "com.unity.collab-proxy": "1.2.15",
-    "com.unity.formats.fbx": "file:../../../build/install/com.unity.formats.fbx",
+    "com.unity.formats.fbx": "file:../../../com.unity.formats.fbx",
     "com.unity.formats.fbx.tests": "file:../../../com.unity.formats.fbx.tests",
     "com.unity.package-manager-ui": "2.1.1",
     "com.unity.package-validation-suite": "0.4.0-preview.13",