Skip to content

Commit eff153f

Browse files
committed
Windows compatibility
1 parent 86d4718 commit eff153f

File tree

12 files changed

+26
-23
lines changed

12 files changed

+26
-23
lines changed

CCOLAMD/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ remake:
6464

6565
# just run cmake to set things up
6666
setup:
67-
( cd build ; cmake $(CMAKE_OPTIONS) .. )
67+
( cd build && cmake $(CMAKE_OPTIONS) .. )
6868

6969
install:
7070
( cd build && cmake --install . )

COLAMD/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ remake:
6464

6565
# just run cmake to set things up
6666
setup:
67-
( cd build ; cmake $(CMAKE_OPTIONS) .. )
67+
( cd build && cmake $(CMAKE_OPTIONS) .. )
6868

6969
install:
7070
( cd build && cmake --install . )

GraphBLAS/GraphBLAS/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ remake:
4444

4545
# just run cmake; do not compile
4646
setup:
47-
( cd build ; cmake $(CMAKE_OPTIONS) .. ; )
47+
( cd build && cmake $(CMAKE_OPTIONS) .. ; )
4848

4949
# installs GraphBLAS to the install location defined by cmake, usually
5050
# /usr/local/lib and /usr/local/include

GraphBLAS/cpu_features/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ go:
99
distclean: purge
1010

1111
install:
12-
( cd build ; make install )
12+
( cd build && make install )
1313

1414
purge:
1515
- rm -rf ./build/*

LAGraph/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,10 @@ remake:
8585

8686
# just run cmake to set things up
8787
setup:
88-
( cd build ; cmake $(CMAKE_OPTIONS) .. )
88+
( cd build && cmake $(CMAKE_OPTIONS) .. )
8989

9090
install:
91-
( cd build ; cmake --install . )
91+
( cd build && cmake --install . )
9292

9393
# remove any installed libraries and #include files
9494
uninstall:

Makefile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ local:
5858
( cd CAMD && $(MAKE) local )
5959
( cd CCOLAMD && $(MAKE) local )
6060
( cd CHOLMOD && $(MAKE) local )
61-
( cd CSparse && $(MAKE) ) # CSparse is compiled but not installed
61+
( cd CSparse && $(MAKE) )
62+
# CSparse is compiled but not installed
6263
( cd CXSparse && $(MAKE) local )
6364
( cd LDL && $(MAKE) local )
6465
( cd KLU && $(MAKE) local )
@@ -81,7 +82,8 @@ global:
8182
( cd CAMD && $(MAKE) global )
8283
( cd CCOLAMD && $(MAKE) global )
8384
( cd CHOLMOD && $(MAKE) global )
84-
( cd CSparse && $(MAKE) ) # CSparse is compiled but not installed
85+
( cd CSparse && $(MAKE) )
86+
# CSparse is compiled but not installed
8587
( cd CXSparse && $(MAKE) global )
8688
( cd LDL && $(MAKE) global )
8789
( cd KLU && $(MAKE) global )
@@ -103,7 +105,8 @@ install:
103105
( cd CAMD && $(MAKE) install )
104106
( cd CCOLAMD && $(MAKE) install )
105107
( cd CHOLMOD && $(MAKE) install )
106-
( cd CXSparse && $(MAKE) install ) # CXSparse is installed instead
108+
( cd CXSparse && $(MAKE) install )
109+
# CXSparse is installed instead
107110
( cd LDL && $(MAKE) install )
108111
( cd KLU && $(MAKE) install )
109112
( cd UMFPACK && $(MAKE) install )

Mongoose/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ global:
4747

4848
# build the Mongoose library (static and dynamic) and run a quick test
4949
demos: library
50-
( cd build ; ./demo )
50+
( cd build && ./demo )
5151
( cd build && ctest . || ctest . --rerun-failed --output-on-failure )
5252

5353
# the same as "make library"
@@ -60,15 +60,15 @@ install:
6060

6161
# create the Doc/Mongoose_UserGuide.pdf
6262
docs:
63-
( cd build ; cmake $(CMAKE_OPTIONS) .. ; cmake --build . --target userguide )
63+
( cd build && cmake $(CMAKE_OPTIONS) .. ; cmake --build . --target userguide )
6464

6565
# remove any installed libraries and #include files
6666
uninstall:
6767
- xargs rm < build/install_manifest.txt
6868

6969
# run the extensive tests
7070
test:
71-
( cd build ; cmake $(CMAKE_OPTIONS) .. ; ctest . )
71+
( cd build && cmake $(CMAKE_OPTIONS) .. ; ctest . )
7272

7373
clean: distclean
7474

SuiteSparse_config/Config/SuiteSparse_config.h.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -545,12 +545,12 @@ int SuiteSparse_version // returns SUITESPARSE_VERSION
545545

546546
// If the suffix does not contain "_", use (Sun Perf., for example):
547547

548-
// cd build ; cmake -DBLAS64_SUFFIX="64" ..
548+
// cd build && cmake -DBLAS64_SUFFIX="64" ..
549549

550550
// If the suffix contains "_" (OpenBLAS in spack for example), use the
551551
// following:
552552

553-
// cd build ; cmake -DBLAS64_SUFFIX="_64" ..
553+
// cd build && cmake -DBLAS64_SUFFIX="_64" ..
554554

555555
// This setting could be used by the spack packaging of SuiteSparse when linked
556556
// with the spack-installed OpenBLAS with 64-bit integers. See

SuiteSparse_config/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,22 +48,22 @@ global:
4848
( cd build && cmake $(CMAKE_OPTIONS) -USUITESPARSE_PKGFILEDIR -DSUITESPARSE_LOCAL_INSTALL=0 .. && cmake --build . --config Release -j${JOBS} )
4949

5050
debug:
51-
( cd build ; cmake $(CMAKE_OPTIONS) -DCMAKE_BUILD_TYPE=Debug .. ; cmake --build . --config Debug )
51+
( cd build && cmake $(CMAKE_OPTIONS) -DCMAKE_BUILD_TYPE=Debug .. ; cmake --build . --config Debug )
5252

5353
all: library
5454

5555
demos: library
5656

5757
# just compile after running cmake; do not run cmake again
5858
remake:
59-
( cd build ; cmake --build . )
59+
( cd build && cmake --build . )
6060

6161
# just run cmake to set things up
6262
setup:
63-
( cd build ; cmake $(CMAKE_OPTIONS) .. )
63+
( cd build && cmake $(CMAKE_OPTIONS) .. )
6464

6565
install:
66-
( cd build ; cmake --install . )
66+
( cd build && cmake --install . )
6767

6868
# remove any installed libraries and #include files
6969
uninstall:

SuiteSparse_config/SuiteSparse_config.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -545,12 +545,12 @@ int SuiteSparse_version // returns SUITESPARSE_VERSION
545545

546546
// If the suffix does not contain "_", use (Sun Perf., for example):
547547

548-
// cd build ; cmake -DBLAS64_SUFFIX="64" ..
548+
// cd build && cmake -DBLAS64_SUFFIX="64" ..
549549

550550
// If the suffix contains "_" (OpenBLAS in spack for example), use the
551551
// following:
552552

553-
// cd build ; cmake -DBLAS64_SUFFIX="_64" ..
553+
// cd build && cmake -DBLAS64_SUFFIX="_64" ..
554554

555555
// This setting could be used by the spack packaging of SuiteSparse when linked
556556
// with the spack-installed OpenBLAS with 64-bit integers. See

SuiteSparse_config/cmake_modules/SuiteSparseBLAS.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ endif ( )
5050
# To request specific BLAS, use either (for example):
5151
#
5252
# CMAKE_OPTIONS="-DBLA_VENDOR=Apple" make
53-
# cd build ; cmake -DBLA_VENDOR=Apple .. ; make
53+
# cd build && cmake -DBLA_VENDOR=Apple .. ; make
5454
#
5555
# Use SUITESPARSE_USE_64BIT_BLAS to select 64-bit or 32-bit BLAS. If
5656
# BLA_VENDOR is also defined, this setting is strictly enforced. If set to

SuiteSparse_config/cmake_modules/SuiteSparseBLAS64.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ set ( SuiteSparse_BLAS_integer "int64_t" )
2525

2626
# If the suffix does not contain "_", use (Sun Perf., for example):
2727

28-
# cd build ; cmake -DBLAS64_SUFFIX="64" ..
28+
# cd build && cmake -DBLAS64_SUFFIX="64" ..
2929

3030
# If the suffix contains "_" (OpenBLAS in spack for example), use the
3131
# following:
3232

33-
# cd build ; cmake -DBLAS64_SUFFIX="_64" ..
33+
# cd build && cmake -DBLAS64_SUFFIX="_64" ..
3434

3535
# This setting could be used by the spack packaging of SuiteSparse when linked
3636
# with the spack-installed OpenBLAS with 64-bit integers. See

0 commit comments

Comments
 (0)