From 735c7c7c9c096f20058b941c0c32a54cf73748a9 Mon Sep 17 00:00:00 2001 From: Eddie Hung Date: Sat, 3 Nov 2018 11:41:36 -0700 Subject: [PATCH] torc now expected to be /opt/torc --- torc | 1 - xc7/family.cmake | 118 +++++++++++++++++++++++------------------------ 2 files changed, 59 insertions(+), 60 deletions(-) delete mode 120000 torc diff --git a/torc b/torc deleted file mode 120000 index bfd9e8f8..00000000 --- a/torc +++ /dev/null @@ -1 +0,0 @@ -../torc/src/torc \ No newline at end of file diff --git a/xc7/family.cmake b/xc7/family.cmake index 6da9fe48..4c835e38 100644 --- a/xc7/family.cmake +++ b/xc7/family.cmake @@ -1,69 +1,69 @@ -include_directories(.) +include_directories(/opt/torc/src) #include_directories(torc/externals/zlib) target_link_libraries( nextpnr-${family} - PRIVATE ${CMAKE_SOURCE_DIR}/torc/architecture/Arc.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/architecture/ArcUsage.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/architecture/Array.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/architecture/DDB.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/architecture/DDBConsoleStreams.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/architecture/DDBStreamHelper.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/architecture/DigestStream.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/architecture/ExtendedWireInfo.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/architecture/InstancePin.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/architecture/OutputStreamHelpers.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/architecture/Package.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/architecture/Pad.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/architecture/PrimitiveConn.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/architecture/PrimitiveDef.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/architecture/PrimitiveElement.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/architecture/PrimitiveElementPin.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/architecture/PrimitivePin.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/architecture/Segments.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/architecture/Site.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/architecture/Sites.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/architecture/Tiles.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/architecture/TileInfo.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/architecture/Tilewire.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/architecture/Versions.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/architecture/VprExporter.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/architecture/WireInfo.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/architecture/WireUsage.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/architecture/XdlImporter.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/architecture/XilinxDatabaseTypes.o + 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 - PRIVATE ${CMAKE_SOURCE_DIR}/torc/common/Annotated.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/common/DeviceDesignator.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/common/Devices.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/common/DirectoryTree.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/common/DottedVersion.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/common/NullOutputStream.o + 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 - PRIVATE ${CMAKE_SOURCE_DIR}/torc/externals/zlib/zfstream.o + PRIVATE /opt/torc/src/torc/externals/zlib/zfstream.o PRIVATE z - PRIVATE ${CMAKE_SOURCE_DIR}/torc/physical/Circuit.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/physical/ConfigMap.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/physical/Config.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/physical/Design.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/physical/Factory.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/physical/Instance.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/physical/InstancePin.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/physical/InstanceReference.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/physical/Module.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/physical/ModuleTransformer.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/physical/Named.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/physical/Net.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/physical/OutputStreamHelpers.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/physical/Pip.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/physical/Port.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/physical/Progenitor.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/physical/Progeny.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/physical/Renamable.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/physical/Routethrough.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/physical/TilewirePlaceholder.o - PRIVATE ${CMAKE_SOURCE_DIR}/torc/physical/XdlExporter.o -# PRIVATE ${CMAKE_SOURCE_DIR}/torc/physical/XdlImporter.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 )