Skip to content

Commit

Permalink
Merge pull request #144 from Astroua/alex
Browse files Browse the repository at this point in the history 
Changes to compile on Mac OS
  • Loading branch information
@pfederl
pfederl committed Mar 9, 2016
2 parents c5feba5 + c3413ec commit 8567428
Show file tree
Hide file tree
Showing 28 changed files with 33 additions and 7 deletions.
4 changes: 2 additions & 2 deletions carta/cpp/common_config.pri
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# File: common_config.pri
# Description: this file contains pointers to all third party software
# Description: this file contains pointers to all third party software
# packages required to build plugins

# you can edit these:
Expand All @@ -8,7 +8,7 @@
CASACOREDIR=../../ThirdParty/casacore-2.10.2016
ASTLIBDIR = ../../ThirdParty/ast-8.0.2
WCSLIBDIR=../../ThirdParty/wcslib
CFITSIODIR=../../ThirdParty/cfitsio-3360-shared
CFITSIODIR=../../ThirdParty/cfitsio-shared
IMAGEANALYSISDIR=../../ThirdParty/imageanalysis-2.10.2016

# don't edit these:
Expand Down
1 change: 1 addition & 0 deletions carta/cpp/core/Data/Image/Contour/Contour.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

#include <QString>
#include <State/StateInterface.h>
#include <cmath>

#include <QPen>

Expand Down
1 change: 1 addition & 0 deletions carta/cpp/core/Data/Profile/Profiler.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

#pragma once

#include <cmath>
#include "State/ObjectManager.h"
#include "State/StateInterface.h"
#include "Data/ILinkable.h"
Expand Down
5 changes: 3 additions & 2 deletions carta/cpp/plugins/ConversionSpectral/ConversionSpectral.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ SOURCES += \
ConverterVelocityWavelength.cpp \
ConverterWavelength.cpp \
ConverterWavelengthFrequency.cpp \
ConverterWavelengthVelocity.cpp
ConverterWavelengthVelocity.cpp

HEADERS += \
SpectralConversionPlugin.h \
Expand All @@ -33,7 +33,7 @@ HEADERS += \
ConverterVelocityWavelength.h \
ConverterWavelength.h \
ConverterWavelengthFrequency.h \
ConverterWavelengthVelocity.h
ConverterWavelengthVelocity.h

casacoreLIBS += -L$${CASACOREDIR}/lib
casacoreLIBS += -lcasa_lattices -lcasa_tables -lcasa_scimath -lcasa_scimath_f -lcasa_mirlib
Expand Down Expand Up @@ -65,6 +65,7 @@ MYFILES = plugin.json

unix:macx {
PRE_TARGETDEPS += $$OUT_PWD/../../core/libcore.dylib
QMAKE_LFLAGS += -undefined dynamic_lookup
}
else{
PRE_TARGETDEPS += $$OUT_PWD/../../core/libcore.so
Expand Down
4 changes: 2 additions & 2 deletions carta/cpp/plugins/Histogram/Histogram.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ LIBS += -L$${WCSLIBDIR}/lib -lwcs

INCLUDEPATH += $${CASACOREDIR}/include
INCLUDEPATH += $${WCSLIBDIR}/include
INCLUDEPATH += $${CFITSIODIR}/include

OTHER_FILES += \
plugin.json
Expand All @@ -49,8 +50,7 @@ QMAKE_EXTRA_COMPILERS += copy_files

unix:macx {
PRE_TARGETDEPS += $$OUT_PWD/../../core/libcore.dylib
PRE_TARGETDEPS += $$OUT_PWD/../CasaImageLoader/libplugin.dylib
LIBS += -L$$OUT_PWD/../CasaImageLoader -lplugin
QMAKE_LFLAGS += -undefined dynamic_lookup
}
else{
PRE_TARGETDEPS += $$OUT_PWD/../../core/libcore.so
Expand Down
1 change: 1 addition & 0 deletions carta/cpp/plugins/ImageAnalysis-2.10.2016/ImageAnalysis-2.10.2016.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ QMAKE_EXTRA_COMPILERS += copy_files

unix:macx {
LIBSTOCOPY += $$files($${PWD}/libs/*.dylib)
QMAKE_LFLAGS += -undefined dynamic_lookup
}
else{
LIBSTOCOPY += $$files($${PWD}/libs/*.so)
Expand Down
1 change: 1 addition & 0 deletions carta/cpp/plugins/ImageAnalysis-2.10.2016/libs/libcomponents.dylib
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
imageanalysis/lib/libcomponents.dylib
1 change: 1 addition & 0 deletions carta/cpp/plugins/ImageAnalysis-2.10.2016/libs/libimageanalysis.dylib
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
imageanalysis/lib/libimageanalysis.dylib
1 change: 1 addition & 0 deletions carta/cpp/plugins/ImageAnalysis-2.10.2016/libs/libstdcasa.dylib
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
imageanalysis/lib/libstdcasa.dylib
1 change: 1 addition & 0 deletions carta/cpp/plugins/ImageStatistics/ImageStatistics.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ MYFILES = plugin.json

unix:macx {
PRE_TARGETDEPS += $$OUT_PWD/../../core/libcore.dylib
QMAKE_LFLAGS += -undefined dynamic_lookup
}
else{
PRE_TARGETDEPS += $$OUT_PWD/../../core/libcore.so
Expand Down
2 changes: 2 additions & 0 deletions carta/cpp/plugins/RegionCASA/RegionCASA.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ LIBS += -L$$OUT_PWD/../../core/ -lcore
LIBS += -L$$OUT_PWD/../../CartaLib/ -lCartaLib

INCLUDEPATH += $${CASACOREDIR}/include
INCLUDEPATH += $${CASACOREDIR}/include/casacore
INCLUDEPATH += $${WCSLIBDIR}/include
INCLUDEPATH += $${CFITSIODIR}/include
#INCLUDEPATH += $$PWD/../../core
Expand All @@ -43,6 +44,7 @@ MYFILES = plugin.json

unix:macx {
PRE_TARGETDEPS += $$OUT_PWD/../../core/libcore.dylib
QMAKE_LFLAGS += -undefined dynamic_lookup
}
else{
PRE_TARGETDEPS += $$OUT_PWD/../../core/libcore.so
Expand Down
1 change: 1 addition & 0 deletions carta/cpp/plugins/casaCore-2.10.2016/libs/libcasa_casa.dylib
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
casacore/lib/libcasa_casa.dylib
1 change: 1 addition & 0 deletions carta/cpp/plugins/casaCore-2.10.2016/libs/libcasa_coordinates.dylib
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
casacore/lib/libcasa_coordinates.dylib
1 change: 1 addition & 0 deletions carta/cpp/plugins/casaCore-2.10.2016/libs/libcasa_derivedmscal.dylib
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
casacore/lib/libcasa_derivedmscal.dylib
1 change: 1 addition & 0 deletions carta/cpp/plugins/casaCore-2.10.2016/libs/libcasa_fits.dylib
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
casacore/lib/libcasa_fits.dylib
1 change: 1 addition & 0 deletions carta/cpp/plugins/casaCore-2.10.2016/libs/libcasa_images.dylib
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
casacore/lib/libcasa_images.dylib
1 change: 1 addition & 0 deletions carta/cpp/plugins/casaCore-2.10.2016/libs/libcasa_lattices.dylib
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
casacore/lib/libcasa_lattices.dylib
1 change: 1 addition & 0 deletions carta/cpp/plugins/casaCore-2.10.2016/libs/libcasa_meas.dylib
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
casacore/lib/libcasa_meas.dylib
1 change: 1 addition & 0 deletions carta/cpp/plugins/casaCore-2.10.2016/libs/libcasa_measures.dylib
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
casacore/lib/libcasa_measures.dylib
1 change: 1 addition & 0 deletions carta/cpp/plugins/casaCore-2.10.2016/libs/libcasa_mirlib.dylib
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
casacore/lib/libcasa_mirlib.dylib
1 change: 1 addition & 0 deletions carta/cpp/plugins/casaCore-2.10.2016/libs/libcasa_ms.dylib
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
casacore/lib/libcasa_ms.dylib
1 change: 1 addition & 0 deletions carta/cpp/plugins/casaCore-2.10.2016/libs/libcasa_msfits.dylib
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
casacore/lib/libcasa_msfits.dylib
1 change: 1 addition & 0 deletions carta/cpp/plugins/casaCore-2.10.2016/libs/libcasa_scimath.dylib
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
casacore/lib/libcasa_scimath.dylib
1 change: 1 addition & 0 deletions carta/cpp/plugins/casaCore-2.10.2016/libs/libcasa_scimath_f.dylib
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
casacore/lib/libcasa_scimath_f.dylib
1 change: 1 addition & 0 deletions carta/cpp/plugins/casaCore-2.10.2016/libs/libcasa_tables.dylib
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
casacore/lib/libcasa_tables.dylib
1 change: 1 addition & 0 deletions carta/cpp/plugins/casaCore-2.10.2016/libs/libcfitsio.dylib
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../../../ThirdParty/cfitsio-shared/lib/libcfitsio.dylib
2 changes: 1 addition & 1 deletion carta/cpp/plugins/casaCore-2.10.2016/libs/libcfitsio.so
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../../../../../ThirdParty/cfitsio-3360-shared/lib/libcfitsio.so
../../../../../ThirdParty/cfitsio-shared/lib/libcfitsio.so
1 change: 1 addition & 0 deletions carta/cpp/plugins/casaCore-2.10.2016/libs/libwcs.dylib
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../../../ThirdParty/wcslib/lib/libwcs.dylib

0 comments on commit 8567428

Please sign in to comment.