Skip to content

Commit cda1b61

Browse files
committed
[#90242] cmake: add MSVC compile options compatible with SystemC
1 parent 10c9b67 commit cda1b61

File tree

2 files changed

+28
-24
lines changed

2 files changed

+28
-24
lines changed

.github/workflows/test.yml

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -280,31 +280,31 @@ jobs:
280280
# renode-revision: ${{ inputs.renode_gitrev || 'master' }}
281281
renode-revision: 90242-add-windows
282282

283-
- name: Install dependencies
284-
shell: bash
285-
run: |
286-
if [ "${{ runner.os }}" = "Linux" ]; then
287-
sudo apt-get -qqy update
288-
sudo apt-get install -qqy cmake
289-
elif [ "${{ runner.os }}" = "Windows" ]; then
290-
choco feature enable -n allowGlobalConfirmation
291-
choco install cmake openssl
292-
else
293-
echo "Unknown runner!"
294-
exit 1
295-
fi
296-
297-
- name: Add OpenSSL to PATH (Windows)
298-
if: runner.os == 'Windows'
299-
shell: bash
300-
run: |
301-
OPENSSL_BIN="/mingw64/bin/openssl"
302-
echo "Adding $OPENSSL_BIN to PATH"
303-
echo "PATH=$PATH:$OPENSSL_BIN" >> $GITHUB_ENV
283+
# - name: Install dependencies
284+
# shell: bash
285+
# run: |
286+
# if [ "${{ runner.os }}" = "Linux" ]; then
287+
# sudo apt-get -qqy update
288+
# sudo apt-get install -qqy cmake
289+
# elif [ "${{ runner.os }}" = "Windows" ]; then
290+
# choco feature enable -n allowGlobalConfirmation
291+
# choco install cmake openssl
292+
# else
293+
# echo "Unknown runner!"
294+
# exit 1
295+
# fi
296+
297+
# - name: Add OpenSSL to PATH (Windows)
298+
# if: runner.os == 'Windows'
299+
# shell: bash
300+
# run: |
301+
# OPENSSL_BIN="/mingw64/bin/openssl"
302+
# echo "Adding $OPENSSL_BIN to PATH"
303+
# echo "PATH=$PATH:$OPENSSL_BIN" >> $GITHUB_ENV
304304

305-
which openssl
306-
openssl version
307-
ls "/mingw64/bin/openssl"
305+
# which openssl
306+
# openssl version
307+
# ls "/mingw64/bin/openssl"
308308

309309
- name: Run tests
310310
shell: bash

cmake/common.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,3 +72,7 @@ set(INCLUDE_DIRS ${INCLUDE_DIRS} systemc/include ${SYSCMODULE_DIR}/include)
7272
add_executable(${EXAMPLE_NAME} ${SOURCES})
7373
target_include_directories(${EXAMPLE_NAME} PUBLIC ${INCLUDE_DIRS})
7474
target_link_libraries(${EXAMPLE_NAME} ${SYSTEMC_LIB} renode_bridge)
75+
76+
if (MSVC)
77+
target_compile_options(${EXAMPLE_NAME} PRIVATE /vmg)
78+
endif()

0 commit comments

Comments
 (0)