Update xc7/family.cmake to use submodule torc

2018-12-27 21:25:07 -08:00 · 2018-12-27 21:25:07 -08:00 · 64f3f25270
commit 64f3f25270
parent 60fc4735bf
1 changed files with 66 additions and 64 deletions
--- a/xc7/family.cmake
+++ b/xc7/family.cmake
@ -1,71 +1,73 @@
-include_directories(/opt/torc/src)
-#include_directories(torc/externals/zlib)
-
+add_dependencies(nextpnr-${family} torc)
+add_custom_target(torc ALL
+                  COMMAND $(MAKE) > /dev/null 2> /dev/null
+                  COMMENT "Building torc (may take some time...)"
+                  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/torc/src)
 find_package(Boost REQUIRED COMPONENTS serialization iostreams ${boost_libs} ${boost_python_lib})

+include_directories(torc/src)
 target_link_libraries(
-    nextpnr-${family}
-	PRIVATE /opt/torc/src/torc/architecture/Arc.o 
-	PRIVATE /opt/torc/src/torc/architecture/ArcUsage.o 
-	PRIVATE /opt/torc/src/torc/architecture/Array.o 
-	PRIVATE /opt/torc/src/torc/architecture/DDB.o 
-	PRIVATE /opt/torc/src/torc/architecture/DDBConsoleStreams.o 
-	PRIVATE /opt/torc/src/torc/architecture/DDBStreamHelper.o 
-	PRIVATE /opt/torc/src/torc/architecture/DigestStream.o 
-	PRIVATE /opt/torc/src/torc/architecture/ExtendedWireInfo.o 
-	PRIVATE /opt/torc/src/torc/architecture/InstancePin.o 
-	PRIVATE /opt/torc/src/torc/architecture/OutputStreamHelpers.o 
-	PRIVATE /opt/torc/src/torc/architecture/Package.o 
-	PRIVATE /opt/torc/src/torc/architecture/Pad.o 
-	PRIVATE /opt/torc/src/torc/architecture/PrimitiveConn.o 
-	PRIVATE /opt/torc/src/torc/architecture/PrimitiveDef.o 
-	PRIVATE /opt/torc/src/torc/architecture/PrimitiveElement.o 
-	PRIVATE /opt/torc/src/torc/architecture/PrimitiveElementPin.o 
-	PRIVATE /opt/torc/src/torc/architecture/PrimitivePin.o 
-	PRIVATE /opt/torc/src/torc/architecture/Segments.o 
-	PRIVATE /opt/torc/src/torc/architecture/Site.o 
-	PRIVATE /opt/torc/src/torc/architecture/Sites.o 
-	PRIVATE /opt/torc/src/torc/architecture/Tiles.o 
-	PRIVATE /opt/torc/src/torc/architecture/TileInfo.o 
-	PRIVATE /opt/torc/src/torc/architecture/Tilewire.o 
-	PRIVATE /opt/torc/src/torc/architecture/Versions.o 
-	PRIVATE /opt/torc/src/torc/architecture/VprExporter.o 
-	PRIVATE /opt/torc/src/torc/architecture/WireInfo.o 
-	PRIVATE /opt/torc/src/torc/architecture/WireUsage.o 
-	PRIVATE /opt/torc/src/torc/architecture/XdlImporter.o 
-	PRIVATE /opt/torc/src/torc/architecture/XilinxDatabaseTypes.o 
+    nextpnr-${family} PRIVATE

-    PRIVATE /opt/torc/src/torc/common/Annotated.o 
-	PRIVATE /opt/torc/src/torc/common/DeviceDesignator.o 
-	PRIVATE /opt/torc/src/torc/common/Devices.o 
-	PRIVATE /opt/torc/src/torc/common/DirectoryTree.o 
-	PRIVATE /opt/torc/src/torc/common/DottedVersion.o 
-	PRIVATE /opt/torc/src/torc/common/NullOutputStream.o 
-    PRIVATE boost_regex
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/architecture/Arc.o
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/architecture/ArcUsage.o
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/architecture/Array.o
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/architecture/DDB.o
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/architecture/DDBConsoleStreams.o
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/architecture/DDBStreamHelper.o
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/architecture/DigestStream.o
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/architecture/ExtendedWireInfo.o
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/architecture/InstancePin.o
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/architecture/OutputStreamHelpers.o
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/architecture/Package.o
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/architecture/Pad.o
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/architecture/PrimitiveConn.o
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/architecture/PrimitiveDef.o
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/architecture/PrimitiveElement.o
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/architecture/PrimitiveElementPin.o
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/architecture/PrimitivePin.o
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/architecture/Segments.o
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/architecture/Site.o
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/architecture/Sites.o
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/architecture/Tiles.o
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/architecture/TileInfo.o
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/architecture/Tilewire.o
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/architecture/Versions.o
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/architecture/VprExporter.o
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/architecture/WireInfo.o
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/architecture/WireUsage.o
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/architecture/XdlImporter.o
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/architecture/XilinxDatabaseTypes.o

-    PRIVATE /opt/torc/src/torc/externals/zlib/zfstream.o
-    PRIVATE z
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/common/Annotated.o
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/common/DeviceDesignator.o
+	${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/common/Devices.o
+	${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/common/DirectoryTree.o
+	${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/common/DottedVersion.o
+	${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/common/NullOutputStream.o

-    PRIVATE /opt/torc/src/torc/physical/Circuit.o
-    PRIVATE /opt/torc/src/torc/physical/ConfigMap.o
-    PRIVATE /opt/torc/src/torc/physical/Config.o
-    PRIVATE /opt/torc/src/torc/physical/Design.o
-    PRIVATE /opt/torc/src/torc/physical/Factory.o
-    PRIVATE /opt/torc/src/torc/physical/Instance.o
-    PRIVATE /opt/torc/src/torc/physical/InstancePin.o
-    PRIVATE /opt/torc/src/torc/physical/InstanceReference.o
-    PRIVATE /opt/torc/src/torc/physical/Module.o
-    PRIVATE /opt/torc/src/torc/physical/ModuleTransformer.o
-    PRIVATE /opt/torc/src/torc/physical/Named.o
-    PRIVATE /opt/torc/src/torc/physical/Net.o
-    PRIVATE /opt/torc/src/torc/physical/OutputStreamHelpers.o
-    PRIVATE /opt/torc/src/torc/physical/Pip.o
-    PRIVATE /opt/torc/src/torc/physical/Port.o
-    PRIVATE /opt/torc/src/torc/physical/Progenitor.o
-    PRIVATE /opt/torc/src/torc/physical/Progeny.o
-    PRIVATE /opt/torc/src/torc/physical/Renamable.o
-    PRIVATE /opt/torc/src/torc/physical/Routethrough.o
-    PRIVATE /opt/torc/src/torc/physical/TilewirePlaceholder.o
-    PRIVATE /opt/torc/src/torc/physical/XdlExporter.o
-#    PRIVATE /opt/torc/src/torc/physical/XdlImporter.o
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/externals/zlib/zfstream.o
+    z
+
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/physical/Circuit.o
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/physical/ConfigMap.o
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/physical/Config.o
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/physical/Design.o
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/physical/Factory.o
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/physical/Instance.o
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/physical/InstancePin.o
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/physical/InstanceReference.o
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/physical/Module.o
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/physical/ModuleTransformer.o
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/physical/Named.o
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/physical/Net.o
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/physical/OutputStreamHelpers.o
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/physical/Pip.o
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/physical/Port.o
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/physical/Progenitor.o
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/physical/Progeny.o
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/physical/Renamable.o
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/physical/Routethrough.o
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/physical/TilewirePlaceholder.o
+    ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/physical/XdlExporter.o
 )