Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
BornAgain
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mlz
BornAgain
Commits
041ce60c
Commit
041ce60c
authored
13 years ago
by
pospelov
Browse files
Options
Downloads
Patches
Plain Diff
attempt to provide mac/linux compatibility
parent
c639c5bc
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
Core/Core.pro
+23
-4
23 additions, 4 deletions
Core/Core.pro
GISASFW.pro
+2
-1
2 additions, 1 deletion
GISASFW.pro
ThirdParty/gtest/gtest.pro
+4
-1
4 additions, 1 deletion
ThirdParty/gtest/gtest.pro
UnitTests/TestCore/TestCore.pro
+19
-8
19 additions, 8 deletions
UnitTests/TestCore/TestCore.pro
with
48 additions
and
14 deletions
Core/Core.pro
+
23
−
4
View file @
041ce60c
...
...
@@ -47,13 +47,32 @@ OTHER_FILES += \
OBJECTS_DIR
=
obj
#
special
configuration
for
shared
library
production
configB
{
TEMPLATE
=
lib
CONFIG
+=
plugin
SOURCES
-=
src
/
main
.
cpp
#
DEFINES
+=
CORE_LIBRARY
}
#
pretty
output
#
QMAKE_CXX
=
@
echo
[
C
++
]
$
<
&&
$$
QMAKE_CXX
#
QMAKE_LINK
=
@
echo
[
LINK
]
$
@
&&
$$
QMAKE_LINK
#############################################################
#
adding
ROOT
libraries
#
the
problem
here
is
that
system
variables
doesn
;
t
propagate
#
into
QtCreator
#############################################################
#
INCLUDEPATH
+=
/
opt
/
local
/
include
/
root
#
LIBS
+=
-
L
/
opt
/
local
/
lib
/
root
-
lGui
-
lCore
-
lCint
-
lRIO
-
lNet
-
lHist
-
lGraf
-
lGraf3d
-
lGpad
-
lTree
-
lRint
-
lPostscript
-
lMatrix
-
lPhysics
-
lMathCore
-
lThread
-
lpthread
-
lm
-
ldl
INCLUDEPATH
+=
$$
system
(
root
-
config
--
incdir
)
LIBS
+=
$$
system
(
root
-
config
--
libdir
)
exists
(
$$
(
ROOTSYS
)
/
bin
/
root
-
config
){
INCLUDEPATH
+=
$$
system
(
$
ROOTSYS
/
bin
/
root
-
config
--
incdir
)
LIBS
+=
$$
system
(
$
ROOTSYS
/
bin
/
root
-
config
--
glibs
)
}
!
exists
(
$$
(
ROOTSYS
)
/
bin
/
root
-
config
){
INCLUDEPATH
+=
/
opt
/
local
/
include
/
root
LIBS
+=
-
L
/
opt
/
local
/
lib
/
root
-
lGui
-
lCore
-
lCint
-
lRIO
-
lNet
-
lHist
-
lGraf
-
lGraf3d
-
lGpad
-
lTree
-
lRint
-
lPostscript
-
lMatrix
-
lPhysics
-
lMathCore
-
lThread
-
lpthread
-
lm
-
ldl
}
#############################################################
...
...
This diff is collapsed.
Click to expand it.
GISASFW.pro
+
2
−
1
View file @
041ce60c
TEMPLATE
=
subdirs
CONFIG
+=
ordered
SUBDIRS
+=
\
Core
\
...
...
@@ -8,3 +7,5 @@ SUBDIRS += \
TestCore
.
depends
=
ThirdParty
/
gtest
#
means
that
compilation
will
be
in
the
listed
order
CONFIG
+=
ordered
This diff is collapsed.
Click to expand it.
ThirdParty/gtest/gtest.pro
+
4
−
1
View file @
041ce60c
...
...
@@ -26,13 +26,16 @@ HEADERS += \
OBJECTS_DIR
=
obj
QMAKE_POST_LINK
=
ln
-
sf
$$
mygtest
/
include
.
#
QMAKE_POST_LINK
=
ln
-
sf
$$
mygtest
/
include
.
#
making
copying
instead
of
link
since
virtual
machine
has
probles
in
making
links
while
being
on
host
partitions
QMAKE_POST_LINK
=
cp
-
r
$$
mygtest
/
include
.
#
target
.
path
=
..
/../
lib
#
INSTALLS
+=
target
#
QMAKE_CLEAN
+=
$
(
TARGET
)
$$
target
.
path
/
$
(
TARGET
)
QMAKE_DISTCLEAN
+=
-
r
$
(
OBJECTS_DIR
)
#
QMAKE_DISTCLEAN
+=
-
r
.
/
include
QMAKE_DISTCLEAN
+=
-
r
.
/
include
This diff is collapsed.
Click to expand it.
UnitTests/TestCore/TestCore.pro
+
19
−
8
View file @
041ce60c
...
...
@@ -5,25 +5,36 @@ TEMPLATE = app
CONFIG
+=
console
CONFIG
-=
qt
CONFIG
-=
app_bundle
CONFIG
+=
build_all
SOURCES
+=
main
.
cpp
\
$$
PWD
/../../
Core
/
src
/
OutputData
.
cpp
\
$$
PWD
/../../
Core
/
src
/
Exceptions
.
cpp
INCLUDEPATH
+=
$$
PWD
/../../
ThirdParty
/
gtest
/
include
..
/../
Core
/
inc
LIBS
+=
-
L
$$
PWD
/../../
ThirdParty
/
gtest
-
lgtest
SOURCES
+=
main
.
cpp
HEADERS
+=
\
NamedVectorTest
.
h
\
OutputDataTest
.
h
INCLUDEPATH
+=
$$
PWD
/../../
ThirdParty
/
gtest
/
include
\
$$
PWD
/../../
Core
/
inc
OBJECTS_DIR
=
obj
LIBS
+=
-
L
$$
OUT_PWD
/../../
ThirdParty
/
gtest
-
lgtest
LIBS
+=
-
L
$$
OUT_PWD
/../../
Core
-
lCore
INCLUDEPATH
+=
$$
system
(
$
ROOTSYS
/
bin
/
root
-
config
--
incdir
)
LIBS
+=
$$
system
(
$
ROOTSYS
/
bin
/
root
-
config
--
glibs
)
#
some
hack
that
might
be
required
for
linux
...
under
investigation
#
LIBS
+=
-
lpthread
#
LDFLAGS
=
-
L
/
lib64
#
QMAKE_CXXFLAGS
+=
-
pthread
PRE_TARGETDEPS
+=
$$
PWD
/../../
Core
/
libCore
.
dylib
#
the
projects
depends
from
third
party
library
"google test"
PRE_TARGETDEPS
+=
$$
PWD
/../../
ThirdParty
/
gtest
/
libgtest
.
a
makelibs
.
target
=
$$
PWD
/../../
ThirdParty
/
gtest
/
libgtest
.
a
#
makelibs
.
target
=
$$
PWD
/../../
ThirdParty
/
gtest
/
libgtest
.
a
makelibs
.
commands
=
(
cd
$$
PWD
/../../
ThirdParty
/
gtest
;
qmake
;
make
)
makelibs
.
depends
=
FORCE
QMAKE_EXTRA_TARGETS
+=
makelibs
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment