Merge lp:~yrke/verifypn/stubborn-set-refactor-merged-buildwin into lp:~tapaal-ltl/verifypn/stubborn-set-refactor-merged

Proposed by Kenneth Yrke Jørgensen
Status: Merged
Merged at revision: 247
Proposed branch: lp:~yrke/verifypn/stubborn-set-refactor-merged-buildwin
Merge into: lp:~tapaal-ltl/verifypn/stubborn-set-refactor-merged
Diff against target: 16 lines (+3/-3)
1 file modified
CMakeLists.txt (+3/-3)
To merge this branch: bzr merge lp:~yrke/verifypn/stubborn-set-refactor-merged-buildwin
Reviewer Review Type Date Requested Status
tapaal-ltl Pending
Review via email: mp+399647@code.launchpad.net

Commit message

Fixed crossbuild for windows

To post a comment you must log in.
248. By Kenneth Yrke Jørgensen

Reverted lib updatewq

249. By Kenneth Yrke Jørgensen

Updated SPOT to 2.9.6

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2021-03-05 21:46:09 +0000
3+++ CMakeLists.txt 2021-03-15 13:40:16 +0000
4@@ -67,10 +67,10 @@
5 )
6
7 ExternalProject_add(spot-ext
8- URL http://www.lrde.epita.fr/dload/spot/spot-2.9.4.tar.gz
9- URL_HASH SHA512=d8e5f8c97495f7964698547d83d8a657afb5e71e886d31298802a6d9d449359d9b34714c080551ca24ab1dce9ca874bfc79ac70d3236dbf6e4fd56bd981483bf
10+ URL http://www.lrde.epita.fr/dload/spot/spot-2.9.6.tar.gz
11+ URL_HASH SHA512=69ec8a3ce84b2c069bf40b8d2127e5085724c8e4ba88ffdefc3e2225f6334955959afd17bcfcde29fd6826d78d49a7f1303bd07ba756a8695473ff6cc5ade3a2
12 BUILD_COMMAND make -j8
13- CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix ${EXTERNAL_INSTALL_LOCATION} --disable-python --disable-devel --disable-debug --disable-shared --enable-static CFLAGS=-flto CXXFLAGS=-flto LDFLAGS=-fuse-linker-plugin
14+ CONFIGURE_COMMAND CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} <SOURCE_DIR>/configure --prefix ${EXTERNAL_INSTALL_LOCATION} --disable-python --disable-devel --disable-debug --disable-shared --enable-static CFLAGS=-flto CXXFLAGS=-flto LDFLAGS=-fuse-linker-plugin
15 INSTALL_COMMAND make install
16 )
17

Subscribers

People subscribed via source and target branches