Skip to content

Commit 72b816e

Browse files
Update CMakeLists.txt
1 parent cabc382 commit 72b816e

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

libs/EXTERNAL/CMakeLists.txt

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ endif ()
3939
if (${WITH_PARMYS})
4040

4141
if (${SYNLIG_SYSTEMVERILOG})
42-
42+
4343
set(SURELOG_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Surelog)
4444
set(SURELOG_BINARY_DIR ${SURELOG_SOURCE_DIR}/build)
4545
set(YOSYS_F4PGA_PLUGINS_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/yosys-f4pga-plugins)
@@ -61,9 +61,10 @@ 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"
67+
6768

6869
# redirect logs to a logfile
6970
LOG_BUILD ON
@@ -95,19 +96,20 @@ if (${WITH_PARMYS})
9596
SOURCE_DIR "${SYNLIG_SOURCE_DIR}"
9697
BUILD_IN_SOURCE FALSE
9798
INSTALL_DIR "${CMAKE_BINARY_DIR}/bin/synlig_install"
98-
99+
99100
# Disable submodule update command (not needed, since it's included in cloning)
100-
UPDATE_COMMAND ""
101-
101+
#INSTALL_COMMAND make install DESTDIR=${CMAKE_BINARY_DIR}/bin/synlig_install
102102
# Pass necessary paths and set environment variables
103103
CMAKE_CACHE_ARGS
104104
"-DCMAKE_BUILD_TYPE:STRING=Release"
105+
"-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_BINARY_DIR}/bin/synlig_install"
105106
"-DSURELOG_PATH=${CMAKE_BINARY_DIR}/surelog"
106107
"-DYOSYS_PATH=${CMAKE_BINARY_DIR}/yosys"
107108
"-DUHDM_INSTALL_DIR=${CMAKE_BINARY_DIR}"
108109
"-DBUILD_DIR=${CMAKE_BINARY_DIR}/synlig-build"
109110
"-DEXPORT_PATH=${CMAKE_BINARY_DIR}/synlig_install/usr/local/bin:$ENV{PATH}"
110-
"-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_BINARY_DIR}/bin/synlig_install"
111+
#"-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_BINARY_DIR}"
112+
111113

112114
LOG_BUILD ON
113115
LOG_UPDATE ON
@@ -116,7 +118,7 @@ if (${WITH_PARMYS})
116118
LOG_OUTPUT_ON_FAILURE ON
117119

118120
# Ensure dependencies like Yosys and Surelog are built first
119-
DEPENDS yosys
121+
DEPENDS yosys
120122
)
121123

122124

0 commit comments

Comments
 (0)