Skip to content

Commit cc31af3

Browse files
bhallerbhaller
committed
fix qmake and cmake builds broken by recent GSL changes
1 parent 4d86b03 commit cc31af3

9 files changed

Lines changed: 26 additions & 10 deletions

File tree

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ endif()
242242
# GSL - adding /usr/local/include so all targets that use GSL_INCLUDES get omp.h
243243
set(TARGET_NAME_GSL gsl)
244244
file(GLOB_RECURSE GSL_SOURCES ${PROJECT_SOURCE_DIR}/gsl/*.c ${PROJECT_SOURCE_DIR}/gsl/*/*.c)
245-
set(GSL_INCLUDES ${PROJECT_SOURCE_DIR}/gsl ${PROJECT_SOURCE_DIR}/gsl/specfunc ${PROJECT_SOURCE_DIR}/gsl/blas ${PROJECT_SOURCE_DIR}/gsl/rng ${PROJECT_SOURCE_DIR}/gsl/cdf ${PROJECT_SOURCE_DIR}/gsl/vector ${PROJECT_SOURCE_DIR}/gsl/err ${PROJECT_SOURCE_DIR}/gsl/sys ${PROJECT_SOURCE_DIR}/gsl/randist ${PROJECT_SOURCE_DIR}/gsl/matrix ${PROJECT_SOURCE_DIR}/gsl/cblas ${PROJECT_SOURCE_DIR}/gsl/complex ${PROJECT_SOURCE_DIR}/gsl/block ${PROJECT_SOURCE_DIR}/gsl/interpolation ${PROJECT_SOURCE_DIR}/gsl/linalg /usr/local/include)
245+
set(GSL_INCLUDES ${PROJECT_SOURCE_DIR}/gsl ${PROJECT_SOURCE_DIR}/gsl/specfunc ${PROJECT_SOURCE_DIR}/gsl/blas ${PROJECT_SOURCE_DIR}/gsl/rng ${PROJECT_SOURCE_DIR}/gsl/cdf ${PROJECT_SOURCE_DIR}/gsl/vector ${PROJECT_SOURCE_DIR}/gsl/err ${PROJECT_SOURCE_DIR}/gsl/sys ${PROJECT_SOURCE_DIR}/gsl/randist ${PROJECT_SOURCE_DIR}/gsl/matrix ${PROJECT_SOURCE_DIR}/gsl/cblas ${PROJECT_SOURCE_DIR}/gsl/complex ${PROJECT_SOURCE_DIR}/gsl/block ${PROJECT_SOURCE_DIR}/gsl/interpolation ${PROJECT_SOURCE_DIR}/gsl/linalg ${PROJECT_SOURCE_DIR}/gsl/permutation /usr/local/include)
246246
add_library(${TARGET_NAME_GSL} STATIC ${GSL_SOURCES})
247247
target_include_directories(${TARGET_NAME_GSL} PUBLIC ${GSL_INCLUDES})
248248

‎SLiM.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2246,13 +2246,13 @@
22462246
98EDB4ED2E65389600CC8798 /* init.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = init.c; sourceTree = "<group>"; };
22472247
98EDB4F72E6538F200CC8798 /* permutation.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = permutation.c; sourceTree = "<group>"; };
22482248
98EDB5012E65399600CC8798 /* permute.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = permute.c; sourceTree = "<group>"; };
2249-
98EDB50B2E6539A500CC8798 /* permute_source.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = permute_source.c; sourceTree = "<group>"; };
2249+
98EDB50B2E6539A500CC8798 /* permute_source.inc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.pascal; path = permute_source.inc; sourceTree = "<group>"; };
22502250
98EDB50C2E653A0300CC8798 /* gsl_permute.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = gsl_permute.h; sourceTree = "<group>"; };
22512251
98EDB50D2E653A5300CC8798 /* gsl_permute_double.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = gsl_permute_double.h; sourceTree = "<group>"; };
22522252
98EDB50E2E653BA400CC8798 /* gsl_permute_matrix_double.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = gsl_permute_matrix_double.h; sourceTree = "<group>"; };
22532253
98EDB50F2E653BA400CC8798 /* gsl_permute_matrix.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = gsl_permute_matrix.h; sourceTree = "<group>"; };
22542254
98EDB5102E65410C00CC8798 /* copy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = copy.c; path = vector/copy.c; sourceTree = "<group>"; };
2255-
98EDB51A2E65412C00CC8798 /* copy_source.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = copy_source.c; path = vector/copy_source.c; sourceTree = "<group>"; };
2255+
98EDB51A2E65412C00CC8798 /* copy_source.inc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.pascal; name = copy_source.inc; path = vector/copy_source.inc; sourceTree = "<group>"; };
22562256
98EF4AB41ECDA5EA00CCDB09 /* profile_H.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = profile_H.pdf; sourceTree = "<group>"; };
22572257
98EF4AB51ECDA5EA00CCDB09 /* profile.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = profile.pdf; sourceTree = "<group>"; };
22582258
98EFE62D1ADB611100CBEC78 /* eidos_symbol_table.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = eidos_symbol_table.cpp; sourceTree = "<group>"; };
@@ -2585,7 +2585,7 @@
25852585
98332AA71FDB99AA00274FF0 /* gsl_vector.h */,
25862586
98332AA81FDB9B3F00274FF0 /* gsl_vector_double.h */,
25872587
98332AC61FDBA6B600274FF0 /* vector.c */,
2588-
98EDB51A2E65412C00CC8798 /* copy_source.c */,
2588+
98EDB51A2E65412C00CC8798 /* copy_source.inc */,
25892589
98EDB5102E65410C00CC8798 /* copy.c */,
25902590
98332B071FDBD00800274FF0 /* init_source.inc */,
25912591
98332B081FDBD00800274FF0 /* init.c */,
@@ -3183,7 +3183,7 @@
31833183
98EDB4DF2E65300500CC8798 /* gsl_permute_vector.h */,
31843184
98EDB4ED2E65389600CC8798 /* init.c */,
31853185
98EDB5012E65399600CC8798 /* permute.c */,
3186-
98EDB50B2E6539A500CC8798 /* permute_source.c */,
3186+
98EDB50B2E6539A500CC8798 /* permute_source.inc */,
31873187
98EDB4F72E6538F200CC8798 /* permutation.c */,
31883188
);
31893189
path = permutation;

‎core/core.pro‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../gsl/debug/ -lgsl
6363
else:unix: LIBS += -L$$OUT_PWD/../gsl/ -lgsl
6464
INCLUDEPATH += $$PWD/../gsl $$PWD/../gsl/blas $$PWD/../gsl/block $$PWD/../gsl/cblas $$PWD/../gsl/cdf
6565
INCLUDEPATH += $$PWD/../gsl/complex $$PWD/../gsl/err $$PWD/../gsl/interpolation $$PWD/../gsl/linalg $$PWD/../gsl/matrix
66-
INCLUDEPATH += $$PWD/../gsl/randist $$PWD/../gsl/rng $$PWD/../gsl/specfunc $$PWD/../gsl/sys $$PWD/../gsl/vector
66+
INCLUDEPATH += $$PWD/../gsl/permutation $$PWD/../gsl/randist $$PWD/../gsl/rng $$PWD/../gsl/specfunc $$PWD/../gsl/sys
67+
INCLUDEPATH += $$PWD/../gsl/vector
6768
DEPENDPATH += $$PWD/../gsl
6869
win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../gsl/release/libgsl.a
6970
else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../gsl/debug/libgsl.a

‎eidos/eidos.pro‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../gsl/debug/ -lgsl
5151
else:unix: LIBS += -L$$OUT_PWD/../gsl/ -lgsl
5252
INCLUDEPATH += $$PWD/../gsl $$PWD/../gsl/blas $$PWD/../gsl/block $$PWD/../gsl/cblas $$PWD/../gsl/cdf
5353
INCLUDEPATH += $$PWD/../gsl/complex $$PWD/../gsl/err $$PWD/../gsl/interpolation $$PWD/../gsl/linalg $$PWD/../gsl/matrix
54-
INCLUDEPATH += $$PWD/../gsl/randist $$PWD/../gsl/rng $$PWD/../gsl/specfunc $$PWD/../gsl/sys $$PWD/../gsl/vector
54+
INCLUDEPATH += $$PWD/../gsl/permutation $$PWD/../gsl/randist $$PWD/../gsl/rng $$PWD/../gsl/specfunc $$PWD/../gsl/sys
55+
INCLUDEPATH += $$PWD/../gsl/vector
5556
DEPENDPATH += $$PWD/../gsl
5657
win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../gsl/release/libgsl.a
5758
else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../gsl/debug/libgsl.a

‎gsl/gsl.pro‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ linux-*: {
3535
QMAKE_CFLAGS += -Wno-unknown-pragmas -Wno-attributes -Wno-unused-parameter -Wno-unused-but-set-parameter
3636
}
3737

38-
INCLUDEPATH = . ./blas ./block ./cblas ./cdf ./complex ./err ./interpolation ./linalg ./matrix ./randist ./rng ./specfunc ./sys ./vector
38+
INCLUDEPATH = . ./blas ./block ./cblas ./cdf ./complex ./err ./interpolation ./linalg ./matrix ./permutation ./randist ./rng ./specfunc ./sys ./vector
3939

4040

4141
# prevent link dependency cycles
@@ -45,6 +45,7 @@ QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
4545
SOURCES += \
4646
blas/blas.c \
4747
block/init.c \
48+
cblas/daxpy.c \
4849
cblas/ddot.c \
4950
cblas/dgemv.c \
5051
cblas/dtrmv.c \
@@ -70,13 +71,17 @@ SOURCES += \
7071
interpolation/spline.c \
7172
interpolation/spline2d.c \
7273
linalg/cholesky.c \
74+
linalg/lu.c \
7375
linalg/tridiag.c \
7476
matrix/copy.c \
7577
matrix/init.c \
7678
matrix/matrix.c \
7779
matrix/rowcol.c \
7880
matrix/submatrix.c \
7981
matrix/swap.c \
82+
permutation/init.c \
83+
permutation/permutation.c \
84+
permutation/permute.c \
8085
randist/beta.c \
8186
randist/binomial_tpe.c \
8287
randist/cauchy.c \
@@ -118,6 +123,7 @@ SOURCES += \
118123
sys/infnan.c \
119124
sys/minmax.c \
120125
sys/pow_int.c \
126+
vector/copy.c \
121127
vector/init.c \
122128
vector/oper.c \
123129
vector/vector.c \
@@ -145,6 +151,7 @@ HEADERS += \
145151
cblas/error_cblas_l2.h \
146152
cblas/error_cblas.h \
147153
cblas/gsl_cblas.h \
154+
cblas/source_axpy_r.h \
148155
cblas/source_dot_r.h \
149156
cblas/source_gemv_r.h \
150157
cblas/source_trmv_r.h \
@@ -164,6 +171,13 @@ HEADERS += \
164171
matrix/gsl_matrix_double.h \
165172
matrix/gsl_matrix.h \
166173
matrix/view.h \
174+
permutation/gsl_permutation.h \
175+
permutation/gsl_permute.h \
176+
permutation/gsl_permute_double.h \
177+
permutation/gsl_permute_matrix.h \
178+
permutation/gsl_permute_matrix_double.h \
179+
permutation/gsl_permute_vector.h \
180+
permutation/gsl_permute_source.h \
167181
randist/gsl_randist.h \
168182
rng/gsl_rng.h \
169183
specfunc/chebyshev.h \

‎gsl/permutation/permute.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
#define BASE_DOUBLE
3434
#include "templates_on.h"
35-
#include "permute_source.c"
35+
#include "permute_source.inc"
3636
#include "templates_off.h"
3737
#undef BASE_DOUBLE
3838

gsl/permutation/permute_source.c renamed to gsl/permutation/permute_source.inc

File renamed without changes.

‎gsl/vector/copy.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
#define BASE_DOUBLE
3030
#include "templates_on.h"
31-
#include "copy_source.c"
31+
#include "copy_source.inc"
3232
#include "templates_off.h"
3333
#undef BASE_DOUBLE
3434

gsl/vector/copy_source.c renamed to gsl/vector/copy_source.inc

File renamed without changes.

0 commit comments

Comments
 (0)