@@ -61,7 +61,7 @@ if (${WITH_PARMYS})
61
61
# define Surelog cache values
62
62
CMAKE_CACHE_ARGS
63
63
"-DCMAKE_BUILD_TYPE:STRING=Release"
64
- # "-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_BINARY_DIR}"
64
+ "-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_BINARY_DIR} "
65
65
"-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON"
66
66
"-DCMAKE_WARN_DEPRECATED:BOOL=OFF"
67
67
@@ -82,7 +82,11 @@ if (${WITH_PARMYS})
82
82
set (SYNLIG_PREFIX_DIR "${CMAKE_BINARY_DIR} /synlig" )
83
83
set (SYNLIG_SOURCE_DIR "${SYNLIG_PREFIX_DIR} /src/synlig" )
84
84
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
+
86
90
ExternalProject_Add (synlig
87
91
PREFIX ${SYNLIG_PREFIX_DIR}
88
92
@@ -92,24 +96,28 @@ if (${WITH_PARMYS})
92
96
GIT_PROGRESS TRUE
93
97
GIT_SHALLOW TRUE
94
98
95
- # Set the correct source directory
99
+ # Corrected install directory
96
100
SOURCE_DIR "${SYNLIG_SOURCE_DIR} "
97
101
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 ""
99
111
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
102
112
# Pass necessary paths and set environment variables
103
113
CMAKE_CACHE_ARGS
104
114
"-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"
106
116
"-DSURELOG_PATH=${CMAKE_BINARY_DIR} /surelog"
107
117
"-DYOSYS_PATH=${CMAKE_BINARY_DIR} /yosys"
108
118
"-DUHDM_INSTALL_DIR=${CMAKE_BINARY_DIR} "
109
119
"-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} "
113
121
114
122
LOG_BUILD ON
115
123
LOG_UPDATE ON
@@ -118,8 +126,9 @@ if (${WITH_PARMYS})
118
126
LOG_OUTPUT_ON_FAILURE ON
119
127
120
128
# Ensure dependencies like Yosys and Surelog are built first
121
- DEPENDS yosys
129
+ DEPENDS yosys
122
130
)
131
+
123
132
124
133
125
134
endif ()
0 commit comments