Skip to content

Commit

Permalink
fix cmake and qmake builds
Browse files Browse the repository at this point in the history
  • Loading branch information
@bhaller
bhaller committed Sep 12, 2023
1 parent 68453a1 commit e22b413
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ endif()
# GSL - adding /usr/local/include so all targets that use GSL_INCLUDES get omp.h
set(TARGET_NAME gsl)
file(GLOB_RECURSE GSL_SOURCES ${PROJECT_SOURCE_DIR}/gsl/*.c ${PROJECT_SOURCE_DIR}/gsl/*/*.c)
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/linalg /usr/local/include)
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)
add_library(${TARGET_NAME} STATIC ${GSL_SOURCES})
target_include_directories(${TARGET_NAME} PUBLIC ${GSL_INCLUDES})

Expand Down
2 changes: 1 addition & 1 deletion QtSLiM/QtSLiM.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../gsl/release/ -lgsl
else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../gsl/debug/ -lgsl
else:unix: LIBS += -L$$OUT_PWD/../gsl/ -lgsl
INCLUDEPATH += $$PWD/../gsl $$PWD/../gsl/blas $$PWD/../gsl/block $$PWD/../gsl/cblas $$PWD/../gsl/cdf
INCLUDEPATH += $$PWD/../gsl/complex $$PWD/../gsl/err $$PWD/../gsl/linalg $$PWD/../gsl/matrix
INCLUDEPATH += $$PWD/../gsl/complex $$PWD/../gsl/err $$PWD/../gsl/interpolation $$PWD/../gsl/linalg $$PWD/../gsl/matrix
INCLUDEPATH += $$PWD/../gsl/randist $$PWD/../gsl/rng $$PWD/../gsl/specfunc $$PWD/../gsl/sys $$PWD/../gsl/vector
DEPENDPATH += $$PWD/../gsl
win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../gsl/release/libgsl.a
Expand Down
20 changes: 0 additions & 20 deletions SLiM.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -667,10 +667,6 @@
98CEFD252AAFABAA00D2C9B4 /* akima.c in Sources */ = {isa = PBXBuildFile; fileRef = 98CEFCDE2AAFABAA00D2C9B4 /* akima.c */; };
98CEFD262AAFABAA00D2C9B4 /* akima.c in Sources */ = {isa = PBXBuildFile; fileRef = 98CEFCDE2AAFABAA00D2C9B4 /* akima.c */; };
98CEFD272AAFABAA00D2C9B4 /* akima.c in Sources */ = {isa = PBXBuildFile; fileRef = 98CEFCDE2AAFABAA00D2C9B4 /* akima.c */; };
98CEFD2C2AAFABAA00D2C9B4 /* Makefile.am in Resources */ = {isa = PBXBuildFile; fileRef = 98CEFCE02AAFABAA00D2C9B4 /* Makefile.am */; };
98CEFD2D2AAFABAA00D2C9B4 /* Makefile.am in Resources */ = {isa = PBXBuildFile; fileRef = 98CEFCE02AAFABAA00D2C9B4 /* Makefile.am */; };
98CEFD2E2AAFABAA00D2C9B4 /* Makefile.am in Resources */ = {isa = PBXBuildFile; fileRef = 98CEFCE02AAFABAA00D2C9B4 /* Makefile.am */; };
98CEFD2F2AAFABAA00D2C9B4 /* Makefile.am in Resources */ = {isa = PBXBuildFile; fileRef = 98CEFCE02AAFABAA00D2C9B4 /* Makefile.am */; };
98CEFD302AAFABAA00D2C9B4 /* spline.c in Sources */ = {isa = PBXBuildFile; fileRef = 98CEFCE22AAFABAA00D2C9B4 /* spline.c */; };
98CEFD312AAFABAA00D2C9B4 /* spline.c in Sources */ = {isa = PBXBuildFile; fileRef = 98CEFCE22AAFABAA00D2C9B4 /* spline.c */; };
98CEFD322AAFABAA00D2C9B4 /* spline.c in Sources */ = {isa = PBXBuildFile; fileRef = 98CEFCE22AAFABAA00D2C9B4 /* spline.c */; };
Expand All @@ -695,10 +691,6 @@
98CEFD552AAFABAA00D2C9B4 /* linear.c in Sources */ = {isa = PBXBuildFile; fileRef = 98CEFCE62AAFABAA00D2C9B4 /* linear.c */; };
98CEFD562AAFABAA00D2C9B4 /* linear.c in Sources */ = {isa = PBXBuildFile; fileRef = 98CEFCE62AAFABAA00D2C9B4 /* linear.c */; };
98CEFD572AAFABAA00D2C9B4 /* linear.c in Sources */ = {isa = PBXBuildFile; fileRef = 98CEFCE62AAFABAA00D2C9B4 /* linear.c */; };
98CEFD582AAFABAA00D2C9B4 /* Makefile.in in Resources */ = {isa = PBXBuildFile; fileRef = 98CEFCE72AAFABAA00D2C9B4 /* Makefile.in */; };
98CEFD592AAFABAA00D2C9B4 /* Makefile.in in Resources */ = {isa = PBXBuildFile; fileRef = 98CEFCE72AAFABAA00D2C9B4 /* Makefile.in */; };
98CEFD5A2AAFABAA00D2C9B4 /* Makefile.in in Resources */ = {isa = PBXBuildFile; fileRef = 98CEFCE72AAFABAA00D2C9B4 /* Makefile.in */; };
98CEFD5B2AAFABAA00D2C9B4 /* Makefile.in in Resources */ = {isa = PBXBuildFile; fileRef = 98CEFCE72AAFABAA00D2C9B4 /* Makefile.in */; };
98CEFD642AAFABAA00D2C9B4 /* accel.c in Sources */ = {isa = PBXBuildFile; fileRef = 98CEFCEA2AAFABAA00D2C9B4 /* accel.c */; };
98CEFD652AAFABAA00D2C9B4 /* accel.c in Sources */ = {isa = PBXBuildFile; fileRef = 98CEFCEA2AAFABAA00D2C9B4 /* accel.c */; };
98CEFD662AAFABAA00D2C9B4 /* accel.c in Sources */ = {isa = PBXBuildFile; fileRef = 98CEFCEA2AAFABAA00D2C9B4 /* accel.c */; };
Expand Down Expand Up @@ -1911,12 +1903,10 @@
98CEFCDC2AAFABAA00D2C9B4 /* gsl_interp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gsl_interp.h; sourceTree = "<group>"; };
98CEFCDD2AAFABAA00D2C9B4 /* integ_eval.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = integ_eval.h; sourceTree = "<group>"; };
98CEFCDE2AAFABAA00D2C9B4 /* akima.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = akima.c; sourceTree = "<group>"; };
98CEFCE02AAFABAA00D2C9B4 /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.am; sourceTree = "<group>"; };
98CEFCE12AAFABAA00D2C9B4 /* gsl_spline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gsl_spline.h; sourceTree = "<group>"; };
98CEFCE22AAFABAA00D2C9B4 /* spline.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = spline.c; sourceTree = "<group>"; };
98CEFCE52AAFABAA00D2C9B4 /* interp2d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = interp2d.c; sourceTree = "<group>"; };
98CEFCE62AAFABAA00D2C9B4 /* linear.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = linear.c; sourceTree = "<group>"; };
98CEFCE72AAFABAA00D2C9B4 /* Makefile.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.in; sourceTree = "<group>"; };
98CEFCE82AAFABAA00D2C9B4 /* gsl_spline2d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gsl_spline2d.h; sourceTree = "<group>"; };
98CEFCEA2AAFABAA00D2C9B4 /* accel.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = accel.c; sourceTree = "<group>"; };
98CEFCEB2AAFABAA00D2C9B4 /* inline.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = inline.c; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2818,12 +2808,10 @@
98CEFCDC2AAFABAA00D2C9B4 /* gsl_interp.h */,
98CEFCDD2AAFABAA00D2C9B4 /* integ_eval.h */,
98CEFCDE2AAFABAA00D2C9B4 /* akima.c */,
98CEFCE02AAFABAA00D2C9B4 /* Makefile.am */,
98CEFCE12AAFABAA00D2C9B4 /* gsl_spline.h */,
98CEFCE22AAFABAA00D2C9B4 /* spline.c */,
98CEFCE52AAFABAA00D2C9B4 /* interp2d.c */,
98CEFCE62AAFABAA00D2C9B4 /* linear.c */,
98CEFCE72AAFABAA00D2C9B4 /* Makefile.in */,
98CEFCE82AAFABAA00D2C9B4 /* gsl_spline2d.h */,
98CEFCEA2AAFABAA00D2C9B4 /* accel.c */,
98CEFCEB2AAFABAA00D2C9B4 /* inline.c */,
Expand Down Expand Up @@ -3211,8 +3199,6 @@
98A4EC941B67C1CD00CD92FD /* EidosConsoleWindow.xib in Resources */,
985724D71AD489AA0047C223 /* check.pdf in Resources */,
98D524641F2E6AFB005AD9A6 /* prettyprint.pdf in Resources */,
98CEFD2E2AAFABAA00D2C9B4 /* Makefile.am in Resources */,
98CEFD5A2AAFABAA00D2C9B4 /* Makefile.in in Resources */,
985724EB1AD6B9FE0047C223 /* execute_selection.pdf in Resources */,
985724F21AD6D4060047C223 /* show_tokens_H.pdf in Resources */,
985724EA1AD6B9FE0047C223 /* execute_selection_H.pdf in Resources */,
Expand Down Expand Up @@ -3262,7 +3248,6 @@
98CF52CB294A3FC900557BBA /* EidosHelpOperators.rtf in Resources */,
98CF52CC294A3FC900557BBA /* add_subpop.pdf in Resources */,
98CF52CD294A3FC900557BBA /* SLiMHaplotypeProgressSheet.xib in Resources */,
98CEFD592AAFABAA00D2C9B4 /* Makefile.in in Resources */,
98CF52CE294A3FC900557BBA /* EidosHelpTypes.rtf in Resources */,
98CF52CF294A3FC900557BBA /* check_H.pdf in Resources */,
98CF52D0294A3FC900557BBA /* show_execution_H.pdf in Resources */,
Expand All @@ -3285,7 +3270,6 @@
98CF52E1294A3FC900557BBA /* edit_submenu_H.pdf in Resources */,
98CF52E2294A3FC900557BBA /* AboutWindow.xib in Resources */,
98CF52E3294A3FC900557BBA /* play_step_H.pdf in Resources */,
98CEFD2D2AAFABAA00D2C9B4 /* Makefile.am in Resources */,
98CF52E4294A3FC900557BBA /* show_recombination_H.pdf in Resources */,
98CF52E5294A3FC900557BBA /* EidosHelpFunctions.rtf in Resources */,
98CF52E6294A3FC900557BBA /* male_symbol.pdf in Resources */,
Expand Down Expand Up @@ -3343,8 +3327,6 @@
98CF5428294A714200557BBA /* EidosConsoleWindow.xib in Resources */,
98CF5429294A714200557BBA /* check.pdf in Resources */,
98CF542A294A714200557BBA /* prettyprint.pdf in Resources */,
98CEFD2F2AAFABAA00D2C9B4 /* Makefile.am in Resources */,
98CEFD5B2AAFABAA00D2C9B4 /* Makefile.in in Resources */,
98CF542B294A714200557BBA /* execute_selection.pdf in Resources */,
98CF542C294A714200557BBA /* show_tokens_H.pdf in Resources */,
98CF542D294A714200557BBA /* execute_selection_H.pdf in Resources */,
Expand Down Expand Up @@ -3394,7 +3376,6 @@
9892282B1BAE279700429674 /* EidosHelpOperators.rtf in Resources */,
98D4C1ED1A6FEAB500FFB083 /* add_subpop.pdf in Resources */,
98B40E011FB452440046F695 /* SLiMHaplotypeProgressSheet.xib in Resources */,
98CEFD582AAFABAA00D2C9B4 /* Makefile.in in Resources */,
9892282E1BAE27AA00429674 /* EidosHelpTypes.rtf in Resources */,
98D4C2271A71F8AD00FFB083 /* check_H.pdf in Resources */,
987AD8801B2CBE580035D6C8 /* show_execution_H.pdf in Resources */,
Expand All @@ -3417,7 +3398,6 @@
98453F621A76041200C058CB /* edit_submenu_H.pdf in Resources */,
98D4C20D1A715F6100FFB083 /* AboutWindow.xib in Resources */,
98D4C1FD1A700DC100FFB083 /* play_step_H.pdf in Resources */,
98CEFD2C2AAFABAA00D2C9B4 /* Makefile.am in Resources */,
98453F5E1A76004300C058CB /* show_recombination_H.pdf in Resources */,
9825566C1BA477D60054CB3F /* EidosHelpFunctions.rtf in Resources */,
98C0943F1B7663DF00766A9A /* male_symbol.pdf in Resources */,
Expand Down
2 changes: 1 addition & 1 deletion core/core.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../gsl/release/ -lgsl
else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../gsl/debug/ -lgsl
else:unix: LIBS += -L$$OUT_PWD/../gsl/ -lgsl
INCLUDEPATH += $$PWD/../gsl $$PWD/../gsl/blas $$PWD/../gsl/block $$PWD/../gsl/cblas $$PWD/../gsl/cdf
INCLUDEPATH += $$PWD/../gsl/complex $$PWD/../gsl/err $$PWD/../gsl/linalg $$PWD/../gsl/matrix
INCLUDEPATH += $$PWD/../gsl/complex $$PWD/../gsl/err $$PWD/../gsl/interpolation $$PWD/../gsl/linalg $$PWD/../gsl/matrix
INCLUDEPATH += $$PWD/../gsl/randist $$PWD/../gsl/rng $$PWD/../gsl/specfunc $$PWD/../gsl/sys $$PWD/../gsl/vector
DEPENDPATH += $$PWD/../gsl
win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../gsl/release/libgsl.a
Expand Down
2 changes: 1 addition & 1 deletion eidos/eidos.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../gsl/release/ -lgsl
else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../gsl/debug/ -lgsl
else:unix: LIBS += -L$$OUT_PWD/../gsl/ -lgsl
INCLUDEPATH += $$PWD/../gsl $$PWD/../gsl/blas $$PWD/../gsl/block $$PWD/../gsl/cblas $$PWD/../gsl/cdf
INCLUDEPATH += $$PWD/../gsl/complex $$PWD/../gsl/err $$PWD/../gsl/linalg $$PWD/../gsl/matrix
INCLUDEPATH += $$PWD/../gsl/complex $$PWD/../gsl/err $$PWD/../gsl/interpolation $$PWD/../gsl/linalg $$PWD/../gsl/matrix
INCLUDEPATH += $$PWD/../gsl/randist $$PWD/../gsl/rng $$PWD/../gsl/specfunc $$PWD/../gsl/sys $$PWD/../gsl/vector
DEPENDPATH += $$PWD/../gsl
win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../gsl/release/libgsl.a
Expand Down
26 changes: 23 additions & 3 deletions gsl/gsl.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ linux-*: {
QMAKE_CFLAGS += -Wno-unknown-pragmas -Wno-attributes -Wno-unused-parameter -Wno-unused-but-set-parameter
}

INCLUDEPATH = . ./blas ./block ./cblas ./cdf ./complex ./err ./linalg ./matrix ./randist ./rng ./specfunc ./sys ./vector
INCLUDEPATH = . ./blas ./block ./cblas ./cdf ./complex ./err ./interpolation ./linalg ./matrix ./randist ./rng ./specfunc ./sys ./vector


# prevent link dependency cycles
Expand All @@ -53,7 +53,19 @@ SOURCES += \
err/error.c \
err/message.c \
err/stream.c \
interpolation/accel.c \
interpolation/akima.c \
interpolation/bicubic.c \
interpolation/bilinear.c \
interpolation/cspline.c \
interpolation/inline.c \
interpolation/interp.c \
interpolation/interp2d.c \
interpolation/linear.c \
interpolation/spline.c \
interpolation/spline2d.c \
linalg/cholesky.c \
linalg/tridiag.c \
matrix/copy.c \
matrix/init.c \
matrix/matrix.c \
Expand Down Expand Up @@ -100,7 +112,8 @@ SOURCES += \
sys/pow_int.c \
vector/init.c \
vector/oper.c \
vector/vector.c
vector/vector.c \
vector/view.c

HEADERS += \
build.h \
Expand Down Expand Up @@ -133,7 +146,13 @@ HEADERS += \
complex/gsl_complex_math.h \
complex/gsl_complex.h \
err/gsl_message.h \
interpolation/gsl_interp.h \
interpolation/gsl_interp2d.h \
interpolation/gsl_spline.h \
interpolation/gsl_spline2d.h \
interpolation/integ_eval.h \
linalg/gsl_linalg.h \
linalg/tridiag.h \
matrix/gsl_matrix_double.h \
matrix/gsl_matrix.h \
matrix/view.h \
Expand All @@ -156,6 +175,7 @@ HEADERS += \
specfunc/gsl_sf_zeta.h \
sys/gsl_sys.h \
vector/gsl_vector_double.h \
vector/gsl_vector.h
vector/gsl_vector.h \
vector/view.h


0 comments on commit e22b413

Please sign in to comment.