Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
A
Apd Toolbox
Manage
Activity
Members
Labels
Plan
Issues
1
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
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
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Jan Reher
Apd Toolbox
Commits
9593f7d3
Commit
9593f7d3
authored
5 years ago
by
Jan Reher
Browse files
Options
Downloads
Patches
Plain Diff
finally fixed it -- who uses a dash instead of an underscore in file names?!
parent
c6a52989
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#1103
failed with stages
in 9 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+1
-6
1 addition, 6 deletions
.gitlab-ci.yml
CMakeLists.txt
+1
-1
1 addition, 1 deletion
CMakeLists.txt
make
+10
-0
10 additions, 0 deletions
make
with
12 additions
and
7 deletions
.gitlab-ci.yml
+
1
−
6
View file @
9593f7d3
...
...
@@ -2,12 +2,7 @@ build:
stage
:
build
script
:
-
export proddb_clientlib_libpath=/home/tau/jreher/git/proddb_clientlib/build
-
export proddb_clientlib_includes=/home/tau/jreher/git/proddb_clientlib/
-
mkdir build
-
cd build
-
cmake3 -DCMAKE_C_COMPILER=/usr/local/bin/gcc -DCMAKE_CXX_COMPILER=/usr/local/bin/g++ ..
-
make
-
./make
artifacts
:
paths
:
-
"
build/apdBatchSetter"
...
...
This diff is collapsed.
Click to expand it.
CMakeLists.txt
+
1
−
1
View file @
9593f7d3
...
...
@@ -4,9 +4,9 @@ project(apdTools)
find_package
(
Qt5 COMPONENTS Core Gui Widgets Network Xml
)
INCLUDE_DIRECTORIES
(
$ENV{proddb_clientlib_includes}
)
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/includes/
)
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/proddb/
)
INCLUDE_DIRECTORIES
(
$ENV{proddb_clientlib_includes}
)
LINK_DIRECTORIES
(
$ENV{proddb_clientlib_libpath}
)
add_library
(
toolbox
"toolbox.cpp"
"serialListReader.h"
"serialListReader.cxx"
)
...
...
This diff is collapsed.
Click to expand it.
make
0 → 100755
+
10
−
0
View file @
9593f7d3
#/bin/tcsh
setenv proddb_clientlib_includes /home/tau/jreher/git/proddb-clientlib/
setenv proddb_clientlib_libpath /home/tau/jreher/git/proddb-clientlib/build/
rm builddir
mkdir builddir
cd builddir
cmake3 -DCMAKE_C_COMPILER=/usr/local/bin/gcc -DCMAKE_CXX_COMPILER=/usr/local/bin/g++ ..
make
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