Skip to content

Commit 7e3089b

Browse files
Update CMakeLists.txt
1 parent 965472e commit 7e3089b

File tree

1 file changed

+20
-11
lines changed

1 file changed

+20
-11
lines changed

libs/EXTERNAL/CMakeLists.txt

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ if (${WITH_PARMYS})
6161
# define Surelog cache values
6262
CMAKE_CACHE_ARGS
6363
"-DCMAKE_BUILD_TYPE:STRING=Release"
64-
#"-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_BINARY_DIR}"
64+
"-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_BINARY_DIR}"
6565
"-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON"
6666
"-DCMAKE_WARN_DEPRECATED:BOOL=OFF"
6767

@@ -82,7 +82,11 @@ if (${WITH_PARMYS})
8282
set(SYNLIG_PREFIX_DIR "${CMAKE_BINARY_DIR}/synlig")
8383
set(SYNLIG_SOURCE_DIR "${SYNLIG_PREFIX_DIR}/src/synlig")
8484

85-
# Clone Synlig repository and ensure submodules are synced before building
85+
# Debug paths to ensure correctness
86+
message("🔍 DEBUG: CMAKE_BINARY_DIR = ${CMAKE_BINARY_DIR}")
87+
message("🔍 DEBUG: SYNLIG_PREFIX_DIR = ${SYNLIG_PREFIX_DIR}")
88+
message("🔍 DEBUG: SYNLIG_SOURCE_DIR = ${SYNLIG_SOURCE_DIR}")
89+
8690
ExternalProject_Add(synlig
8791
PREFIX ${SYNLIG_PREFIX_DIR}
8892

@@ -92,24 +96,28 @@ if (${WITH_PARMYS})
9296
GIT_PROGRESS TRUE
9397
GIT_SHALLOW TRUE
9498

95-
# Set the correct source directory
99+
# Corrected install directory
96100
SOURCE_DIR "${SYNLIG_SOURCE_DIR}"
97101
BUILD_IN_SOURCE FALSE
98-
INSTALL_DIR "${CMAKE_BINARY_DIR}/bin/synlig_install"
102+
INSTALL_DIR "${CMAKE_BINARY_DIR}/synlig_install_exe"
103+
104+
# Ensure submodules are synced (CI sometimes skips this)
105+
UPDATE_COMMAND git submodule update --init --recursive
106+
107+
# Build and install correctly
108+
BUILD_COMMAND ${MAKE_PROGRAM} -C ${SYNLIG_SOURCE_DIR} install DESTDIR=${CMAKE_BINARY_DIR}/synlig_install_exe -j${PROCESSOR_COUNT}
109+
INSTALL_COMMAND ""
110+
CONFIGURE_COMMAND ""
99111

100-
# Disable submodule update command (not needed, since it's included in cloning)
101-
#INSTALL_COMMAND make install DESTDIR=${CMAKE_BINARY_DIR}/bin/synlig_install
102112
# Pass necessary paths and set environment variables
103113
CMAKE_CACHE_ARGS
104114
"-DCMAKE_BUILD_TYPE:STRING=Release"
105-
"-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_BINARY_DIR}/bin/synlig_install"
115+
"-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_BINARY_DIR}/synlig_install"
106116
"-DSURELOG_PATH=${CMAKE_BINARY_DIR}/surelog"
107117
"-DYOSYS_PATH=${CMAKE_BINARY_DIR}/yosys"
108118
"-DUHDM_INSTALL_DIR=${CMAKE_BINARY_DIR}"
109119
"-DBUILD_DIR=${CMAKE_BINARY_DIR}/synlig-build"
110-
"-DEXPORT_PATH=${CMAKE_BINARY_DIR}/synlig_install/usr/local/bin:$ENV{PATH}"
111-
#"-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_BINARY_DIR}"
112-
120+
"-DEXPORT_PATH=${CMAKE_BINARY_DIR}/synlig_install/bin:$ENV{PATH}"
113121

114122
LOG_BUILD ON
115123
LOG_UPDATE ON
@@ -118,8 +126,9 @@ if (${WITH_PARMYS})
118126
LOG_OUTPUT_ON_FAILURE ON
119127

120128
# Ensure dependencies like Yosys and Surelog are built first
121-
DEPENDS yosys
129+
DEPENDS yosys
122130
)
131+
123132

124133

125134
endif ()

0 commit comments

Comments
 (0)