Skip to content

Commit 980bcb6

Browse files
authored
Merge pull request #848 from os-fpga/copying_patched_vpr_latest_CMakefile
copying patched vpr_latest CMakefile to vpr_latest/vtr/
2 parents a0b5b31 + 1557493 commit 980bcb6

File tree

2 files changed

+25
-17
lines changed

2 files changed

+25
-17
lines changed

CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ else()
5252
set(ENCRYPTION_CONFIG_PATH ${CMAKE_CURRENT_SOURCE_DIR}/OpenFPGA/vtr-verilog-to-routing/libs/libdecrypt)
5353
endif()
5454
set(VPR_DEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}/OpenFPGA/vtr-verilog-to-routing/vpr)
55+
set(VPR_LATEST_DEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}/vpr_latest/vtr)
5556
set(OPENFPGA_DEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}/OpenFPGA/)
5657
set(XML_DEC_KEY_DEST ${CMAKE_CURRENT_SOURCE_DIR}/OpenFPGA/vtr-verilog-to-routing/libs/)
5758
set(LIB_RRG_DEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}/OpenFPGA/vtr-verilog-to-routing/libs/librrgraph)
@@ -232,6 +233,12 @@ file(COPY
232233
DESTINATION
233234
${VPR_DEST_DIR})
234235

236+
message(STATUS "NOTE: COPY-PATCHING vpr_latest CMakefile..")
237+
file(COPY
238+
${PATCH_DIR}/CMAKE_fix/PATCHED_vpr_latest/CMakeLists.txt
239+
DESTINATION
240+
${VPR_LATEST_DEST_DIR})
241+
235242
#FILE(COPY ${PLACER_SRC_DIR}/move_generator.h
236243
# ## ${PLACER_SRC_DIR}/place.cpp
237244
# ${PLACER_SRC_DIR}/place_util.cpp

include/CMAKE_fix/PATCHED_vpr_latest/CMakeLists.txt

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ separate_arguments(
368368
#
369369
# Unit Testing
370370
#
371-
enable_testing()
371+
#enable_testing()
372372

373373
#
374374
# Sub-projects
@@ -495,27 +495,28 @@ endif()
495495
# Code Autoformatting
496496
#
497497
#
498-
list(APPEND DIRS_TO_FORMAT_CPP "${CMAKE_CURRENT_SOURCE_DIR}/vpr")
499-
list(APPEND DIRS_TO_FORMAT_CPP "${CMAKE_CURRENT_SOURCE_DIR}/libs/libarchfpga")
500-
list(APPEND DIRS_TO_FORMAT_CPP "${CMAKE_CURRENT_SOURCE_DIR}/libs/libvtrutil")
501-
list(APPEND DIRS_TO_FORMAT_CPP "${CMAKE_CURRENT_SOURCE_DIR}/libs/libpugiutil")
502-
list(APPEND DIRS_TO_FORMAT_CPP "${CMAKE_CURRENT_SOURCE_DIR}/libs/liblog")
503-
list(APPEND DIRS_TO_FORMAT_CPP "${CMAKE_CURRENT_SOURCE_DIR}/libs/librtlnumber")
504-
list(APPEND DIRS_TO_FORMAT_CPP "${CMAKE_CURRENT_SOURCE_DIR}/odin_ii")
498+
#list(APPEND DIRS_TO_FORMAT_CPP "${CMAKE_CURRENT_SOURCE_DIR}/vpr")
499+
#list(APPEND DIRS_TO_FORMAT_CPP "${CMAKE_CURRENT_SOURCE_DIR}/libs/libarchfpga")
500+
#list(APPEND DIRS_TO_FORMAT_CPP "${CMAKE_CURRENT_SOURCE_DIR}/libs/libvtrutil")
501+
#list(APPEND DIRS_TO_FORMAT_CPP "${CMAKE_CURRENT_SOURCE_DIR}/libs/libpugiutil")
502+
#list(APPEND DIRS_TO_FORMAT_CPP "${CMAKE_CURRENT_SOURCE_DIR}/libs/liblog")
503+
#list(APPEND DIRS_TO_FORMAT_CPP "${CMAKE_CURRENT_SOURCE_DIR}/libs/librtlnumber")
504+
#list(APPEND DIRS_TO_FORMAT_CPP "${CMAKE_CURRENT_SOURCE_DIR}/odin_ii")
505505

506-
include(AutoClangFormat)
506+
#include(AutoClangFormat)
507507

508-
list(APPEND DIRS_TO_FORMAT_PY "${CMAKE_CURRENT_SOURCE_DIR}/odin_ii")
509-
list(APPEND DIRS_TO_FORMAT_PY "${CMAKE_CURRENT_SOURCE_DIR}/ace2")
510-
list(APPEND DIRS_TO_FORMAT_PY "${CMAKE_CURRENT_SOURCE_DIR}/dev")
511-
list(APPEND DIRS_TO_FORMAT_PY "${CMAKE_CURRENT_SOURCE_DIR}/doc")
512-
list(APPEND DIRS_TO_FORMAT_PY "${CMAKE_CURRENT_SOURCE_DIR}/vpr")
513-
list(APPEND DIRS_TO_FORMAT_PY "${CMAKE_CURRENT_SOURCE_DIR}/vtr_flow")
508+
#list(APPEND DIRS_TO_FORMAT_PY "${CMAKE_CURRENT_SOURCE_DIR}/odin_ii")
509+
#list(APPEND DIRS_TO_FORMAT_PY "${CMAKE_CURRENT_SOURCE_DIR}/ace2")
510+
#list(APPEND DIRS_TO_FORMAT_PY "${CMAKE_CURRENT_SOURCE_DIR}/dev")
511+
#list(APPEND DIRS_TO_FORMAT_PY "${CMAKE_CURRENT_SOURCE_DIR}/doc")
512+
#list(APPEND DIRS_TO_FORMAT_PY "${CMAKE_CURRENT_SOURCE_DIR}/vpr")
513+
#list(APPEND DIRS_TO_FORMAT_PY "${CMAKE_CURRENT_SOURCE_DIR}/vtr_flow")
514514

515-
include(AutoPyFormat)
515+
#include(AutoPyFormat)
516516

517517

518518
#
519519
# Python Environment setup
520520
#
521-
include(PyEnv)
521+
#include(PyEnv)
522+

0 commit comments

Comments
 (0)