Skip to content

Commit 3bc7ad8

Browse files
new VPR cmake diff
1 parent 394f985 commit 3bc7ad8

File tree

1 file changed

+13
-37
lines changed

1 file changed

+13
-37
lines changed

include/CMAKE_fix/VPR_CMake.diff

Lines changed: 13 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
diff --git a/vpr/CMakeLists.txt b/vpr/CMakeLists.txt
2-
index 371d11f39..b9fe13934 100644
2+
index 433ef2730..fa6b7f352 100644
33
--- a/vpr/CMakeLists.txt
44
+++ b/vpr/CMakeLists.txt
5-
@@ -1,4 +1,4 @@
6-
-cmake_minimum_required(VERSION 3.16)
7-
+cmake_minimum_required(VERSION 3.9)
8-
9-
project("vpr")
10-
115
@@ -32,6 +32,10 @@ else()
126
message(STATUS "EZGL: graphics disabled")
137
endif()
@@ -43,36 +37,26 @@ index 371d11f39..b9fe13934 100644
4337
+
4438
files_to_dirs(LIB_HEADERS LIB_INCLUDE_DIRS)
4539

46-
if(${VTR_ENABLE_CAPNPROTO})
47-
@@ -60,6 +82,7 @@ add_library(libvpr STATIC
40+
if(${VPR_DEBUG_PARTITION_TREE})
41+
@@ -56,6 +78,7 @@ add_library(libvpr STATIC
4842

4943

5044
target_include_directories(libvpr PUBLIC ${LIB_INCLUDE_DIRS})
5145
+target_include_directories(libvpr PUBLIC ${READ_EDIF_SRC_DIR})
5246

53-
#VPR_ANALYTIC_PLACE is inisitalized in the root CMakeLists
47+
#VPR_ANALYTIC_PLACE is initialized in the root CMakeLists
5448
#Check Eigen dependency
55-
@@ -80,16 +103,9 @@ endif()
56-
set_target_properties(libvpr PROPERTIES PREFIX "") #Avoid extra 'lib' prefix
57-
58-
#Specify link-time dependancies
59-
-target_link_libraries(libvpr
60-
- libvtrutil
61-
- libarchfpga
62-
- libsdcparse
63-
- libblifparse
64-
- libtatum
65-
- libargparse
66-
- libpugixml
67-
- librrgraph
68-
-)
69-
+# 2nd RS patch - PRODUCTION_BUILD
70-
+include("${CMAKE_CURRENT_LIST_DIR}/VPR_CMake_PRODUCTION_BUILD_RS2.cmake")
71-
+message(STATUS "NOTE: INCLUDED VPR_CMake_PRODUCTION_BUILD_RS2.cmake\n")
49+
@@ -85,6 +108,9 @@ target_link_libraries(libvpr
50+
libargparse
51+
libpugixml
52+
librrgraph
53+
+ libreadedif
54+
+ ${OPENSSL_LIBRARIES}
55+
+ ${VERIFIC_LIBS} dl
56+
)
7257

7358
#link graphics library only when graphics set to on
74-
if (VPR_USE_EZGL STREQUAL "on")
75-
@@ -236,7 +252,7 @@ endif()
59+
@@ -233,7 +259,7 @@ endif()
7660
#Configure the build to use the selected engine
7761
if (VPR_USE_EXECUTION_ENGINE STREQUAL "tbb")
7862
target_compile_definitions(libvpr PRIVATE VPR_USE_TBB)
@@ -81,11 +65,3 @@ index 371d11f39..b9fe13934 100644
8165
target_link_libraries(libvpr ${TBB_tbbmalloc_proxy_LIBRARY}) #Use the scalable memory allocator
8266
message(STATUS "VPR: will support parallel execution using '${VPR_USE_EXECUTION_ENGINE}'")
8367
elseif(VPR_USE_EXECUTION_ENGINE STREQUAL "serial")
84-
@@ -257,7 +273,6 @@ if (VPR_USE_SIGNAL_HANDLER)
85-
endif()
86-
87-
install(TARGETS vpr libvpr DESTINATION bin)
88-
-install(FILES ${LIB_HEADERS} DESTINATION include/libvpr)
89-
90-
91-
#

0 commit comments

Comments
 (0)