@@ -77,17 +77,17 @@ if (${WITH_PARMYS})
77
77
DEPENDS yosys
78
78
)
79
79
80
- # Synlig integration (manages Surelog and UHDM internally)
81
-
82
80
set (SYNLIG_PREFIX_DIR "${CMAKE_CURRENT_SOURCE_DIR} /synlig" )
83
81
set (SYNLIG_BINARY_DIR "${SYNLIG_PREFIX_DIR} /build" )
84
82
set (SYNLIG_SOURCE_DIR "${SYNLIG_PREFIX_DIR} /src/synlig" )
83
+ set (SYNLIG_INSTALL_DIR "${SYNLIG_BINARY_DIR} /install" ) # Ensure proper install
85
84
86
85
# Debug paths to ensure correctness
87
- message ("🔍 DEBUG: CMAKE_BINARY_DIR = ${CMAKE_BINARY_DIR } " )
86
+ message ("🔍 DEBUG: CMAKE_CURRENT_SOURCE_DIR = ${CMAKE_CURRENT_SOURCE_DIR } " )
88
87
message ("🔍 DEBUG: SYNLIG_PREFIX_DIR = ${SYNLIG_PREFIX_DIR} " )
89
88
message ("🔍 DEBUG: SYNLIG_SOURCE_DIR = ${SYNLIG_SOURCE_DIR} " )
90
89
message ("🔍 DEBUG: SYNLIG_BINARY_DIR = ${SYNLIG_BINARY_DIR} " )
90
+ message ("🔍 DEBUG: SYNLIG_INSTALL_DIR = ${SYNLIG_INSTALL_DIR} " )
91
91
92
92
ExternalProject_Add (synlig
93
93
PREFIX ${SYNLIG_PREFIX_DIR}
@@ -100,27 +100,21 @@ if (${WITH_PARMYS})
100
100
101
101
# Corrected install directory
102
102
SOURCE_DIR "${SYNLIG_SOURCE_DIR} "
103
+ BINARY_DIR "${SYNLIG_BINARY_DIR} "
103
104
BUILD_IN_SOURCE FALSE
104
- INSTALL_DIR "${SYNLIG_BINARY_DIR} "
105
105
106
106
# Ensure submodules are synced (CI sometimes skips this)
107
107
UPDATE_COMMAND git submodule update --init --recursive
108
108
109
- # Build and install correctly
109
+ # Build and install in one command
110
110
BUILD_COMMAND ${MAKE_PROGRAM} -C ${SYNLIG_SOURCE_DIR} install DESTDIR=${SYNLIG_BINARY_DIR} -j${PROCESSOR_COUNT}
111
- INSTALL_COMMAND ""
112
- CONFIGURE_COMMAND ""
113
-
111
+
114
112
# Pass necessary paths and set environment variables
115
113
CMAKE_CACHE_ARGS
116
114
"-DCMAKE_BUILD_TYPE:STRING=Release"
117
- "-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_BINARY_DIR} /synlig_install"
118
- "-DSURELOG_PATH=${CMAKE_BINARY_DIR} /surelog"
119
- "-DYOSYS_PATH=${CMAKE_BINARY_DIR} /yosys"
120
- "-DUHDM_INSTALL_DIR=${CMAKE_BINARY_DIR} "
121
- "-DBUILD_DIR=${CMAKE_BINARY_DIR} /synlig-build"
122
- "-DEXPORT_PATH=${CMAKE_BINARY_DIR} /synlig_install/bin:$ENV{PATH} "
123
-
115
+ "-DCMAKE_INSTALL_PREFIX:PATH=${SYNLIG_BINARY_DIR} "
116
+ "-DBUILD_DIR=${SYNLIG_BINARY_DIR} "
117
+
124
118
LOG_BUILD ON
125
119
LOG_UPDATE ON
126
120
LOG_INSTALL ON
@@ -129,8 +123,7 @@ if (${WITH_PARMYS})
129
123
130
124
# Ensure dependencies like Yosys and Surelog are built first
131
125
DEPENDS yosys
132
- )
133
-
126
+ )
134
127
135
128
136
129
endif ()
0 commit comments