Skip to content

Commit 3a46e76

Browse files
Update CMakeLists.txt
1 parent 5a43529 commit 3a46e76

File tree

1 file changed

+10
-17
lines changed

1 file changed

+10
-17
lines changed

libs/EXTERNAL/CMakeLists.txt

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -77,17 +77,17 @@ if (${WITH_PARMYS})
7777
DEPENDS yosys
7878
)
7979

80-
# Synlig integration (manages Surelog and UHDM internally)
81-
8280
set(SYNLIG_PREFIX_DIR "${CMAKE_CURRENT_SOURCE_DIR}/synlig")
8381
set(SYNLIG_BINARY_DIR "${SYNLIG_PREFIX_DIR}/build")
8482
set(SYNLIG_SOURCE_DIR "${SYNLIG_PREFIX_DIR}/src/synlig")
83+
set(SYNLIG_INSTALL_DIR "${SYNLIG_BINARY_DIR}/install") # Ensure proper install
8584

8685
# 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}")
8887
message("🔍 DEBUG: SYNLIG_PREFIX_DIR = ${SYNLIG_PREFIX_DIR}")
8988
message("🔍 DEBUG: SYNLIG_SOURCE_DIR = ${SYNLIG_SOURCE_DIR}")
9089
message("🔍 DEBUG: SYNLIG_BINARY_DIR = ${SYNLIG_BINARY_DIR}")
90+
message("🔍 DEBUG: SYNLIG_INSTALL_DIR = ${SYNLIG_INSTALL_DIR}")
9191

9292
ExternalProject_Add(synlig
9393
PREFIX ${SYNLIG_PREFIX_DIR}
@@ -100,27 +100,21 @@ if (${WITH_PARMYS})
100100

101101
# Corrected install directory
102102
SOURCE_DIR "${SYNLIG_SOURCE_DIR}"
103+
BINARY_DIR "${SYNLIG_BINARY_DIR}"
103104
BUILD_IN_SOURCE FALSE
104-
INSTALL_DIR "${SYNLIG_BINARY_DIR}"
105105

106106
# Ensure submodules are synced (CI sometimes skips this)
107107
UPDATE_COMMAND git submodule update --init --recursive
108108

109-
# Build and install correctly
109+
# Build and install in one command
110110
BUILD_COMMAND ${MAKE_PROGRAM} -C ${SYNLIG_SOURCE_DIR} install DESTDIR=${SYNLIG_BINARY_DIR} -j${PROCESSOR_COUNT}
111-
INSTALL_COMMAND ""
112-
CONFIGURE_COMMAND ""
113-
111+
114112
# Pass necessary paths and set environment variables
115113
CMAKE_CACHE_ARGS
116114
"-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+
124118
LOG_BUILD ON
125119
LOG_UPDATE ON
126120
LOG_INSTALL ON
@@ -129,8 +123,7 @@ if (${WITH_PARMYS})
129123

130124
# Ensure dependencies like Yosys and Surelog are built first
131125
DEPENDS yosys
132-
)
133-
126+
)
134127

135128

136129
endif ()

0 commit comments

Comments
 (0)