Skip to content

Commit 0d4f943

Browse files
committed
try sorting out Windows compilation problems by overriding SuiteSparse_long macros
1 parent 1973bd9 commit 0d4f943

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

CMakeLists.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ macro(add_prefix prefix rootlist)
2828
set(${rootlist} ${outlist})
2929
endmacro(add_prefix)
3030

31+
add_definitions("-DSuiteSparse_long=long long")
32+
add_definitions("-DSuiteSparse_long_max=9223372036854775801")
33+
add_definitions("-DSuiteSparse_long_idd=lld")
34+
add_definitions("-DSUNDIALS_INT64_T=1")
35+
3136
### sources ########################################################################################
3237

3338
set(PyPartMC_sources
@@ -184,7 +189,6 @@ add_library(klulib STATIC
184189
${klu_SOURCES}
185190
)
186191
target_compile_definitions(klulib PRIVATE DLONG="1")
187-
target_compile_definitions(klulib PRIVATE SUNDIALS_INT64_T="1")
188192
target_include_directories(klulib PRIVATE ${KLU_INCLUDE_DIRS})
189193

190194
### SUNDIALS #######################################################################################
@@ -206,7 +210,6 @@ macro(sundials_add_library target)
206210
)
207211
add_library(${target} STATIC ${sundials_add_library_SOURCES})
208212
target_compile_definitions(${target} PRIVATE SUNDIALS_STATIC_DEFINE)
209-
target_compile_definitions(${target} PRIVATE SUNDIALS_INT64_T="1")
210213
target_include_directories(${target} PRIVATE
211214
${SUNDIALS_SOURCE_DIR}/src/sundials
212215
${SUNDIALS_SOURCE_DIR}/include
@@ -257,7 +260,6 @@ add_prefix(sundials_ SUNDIALS_items)
257260
add_library(camplib STATIC ${camp_SOURCES} ${json_fortran_SOURCES})
258261
target_compile_definitions(camplib PRIVATE CAMP_USE_JSON="1")
259262
target_compile_definitions(camplib PRIVATE CAMP_USE_SUNDIALS="1")
260-
target_compile_definitions(camplib PRIVATE SUNDIALS_INT64_T="1")
261263
target_include_directories(camplib PRIVATE
262264
${KLU_INCLUDE_DIRS}
263265
${SUNDIALS_SOURCE_DIR}/include

0 commit comments

Comments
 (0)