Merge pull request #1 from nyue/FuseFX

nyue · web-flow · commit 685daa9d374c · 2020-07-16T17:58:53.000-07:00
Installation directory update for FuseFX
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,7 +13,7 @@ IF ( BUILD_ALEMBIC_TOOLS )
   FIND_PACKAGE ( Alembic REQUIRED )
   FIND_PACKAGE ( HDF5 COMPONENTS C HL REQUIRED )
 ENDIF ()
-FIND_PACKAGE ( ILMBase REQUIRED )
+FIND_PACKAGE ( IlmBase REQUIRED )
 
 # Mutually exclusive
 IF ( BUILD_HOUDINI_TOOLS )
@@ -46,6 +46,7 @@ SET  ( NCACHE_REQUIRED_LIBRARIES
   nCacheParser
   ${Boost_LIBRARIES}
   ${GLOG_glog_LIBRARY}
+  ${GFLAGS_gflags_LIBRARY}
   ${ADDITIONAL_LIBRARIES}
   ${CMAKE_THREAD_LIBS_INIT}
   )
diff --git a/houdini/mantra/nCache/CMakeLists.txt b/houdini/mantra/nCache/CMakeLists.txt
@@ -7,5 +7,5 @@ TARGET_LINK_LIBRARIES ( VRAY_nCache
   )
   
 INSTALL ( TARGETS VRAY_nCache
-  DESTINATION ${HDK_HOME_HFS}/dso/mantra
+  DESTINATION houdini/dso/mantra
   )
diff --git a/houdini/translator/nCache_IOTranslator/CMakeLists.txt b/houdini/translator/nCache_IOTranslator/CMakeLists.txt
@@ -10,3 +10,7 @@ TARGET_LINK_LIBRARIES ( nCache
   ${NCACHE_REQUIRED_LIBRARIES}
   NCacheTranslatorUtils
   )
+
+INSTALL ( TARGETS nCache
+  DESTINATION houdini/dso
+  )

Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,5 @@ TARGET_LINK_LIBRARIES ( VRAY_nCache`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`INSTALL ( TARGETS VRAY_nCache`
`10`		`- DESTINATION ${HDK_HOME_HFS}/dso/mantra`
	`10`	`+ DESTINATION houdini/dso/mantra`
`11`	`11`	`)`
Original file line number	Diff line number	Diff line change
`@@ -10,3 +10,7 @@ TARGET_LINK_LIBRARIES ( nCache`
`10`	`10`	`${NCACHE_REQUIRED_LIBRARIES}`
`11`	`11`	`NCacheTranslatorUtils`
`12`	`12`	`)`
	`13`	`+`
	`14`	`+INSTALL ( TARGETS nCache`
	`15`	`+ DESTINATION houdini/dso`
	`16`	`+ )`