Adjusted CMakeLists.txt to not use fixed paths, and made sure the needed...

Adjusted CMakeLists.txt to not use fixed paths, and made sure the needed environment variables are set in .gitlab-ci.yml

.gitlab-ci.yml

@@ -12,6 +12,8 @@ build:
   #   - apt update && apt -y install make autoconf
 
   script:
+    - setenv proddb_clientlib_includes /home/tau/jreher/git/proddb_clientlib/
+    - setenv proddb_clientlib_libpath ${proddb_clientlib_includes}/build
     - mkdir build
     - cd build
     - cmake3 -DCMAKE_C_COMPILER=/usr/local/bin/gcc -DCMAKE_CXX_COMPILER=/usr/local/bin/g++ ..

CMakeLists.txt

@@ -4,10 +4,10 @@ project(apdTools)
 
 find_package(Qt5 COMPONENTS Core Gui Widgets Network Xml)
 
-INCLUDE_DIRECTORIES(/home/tau/jreher/git/proddb-clientlib/)
+INCLUDE_DIRECTORIES($ENV{proddb_clientlib_includes})
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/includes/)
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/proddb/)
-LINK_DIRECTORIES(/home/tau/jreher/git/proddb-clientlib/build/)
+LINK_DIRECTORIES($ENV{proddb_clientlib_libpath})
 
 add_library(toolbox "toolbox.cpp" "serialListReader.h" "serialListReader.cxx")
 add_library(proddbaccess "proddb/ProdDbAccess.cxx" "proddb/ProdDbAccess.h" "proddb/ProductionDatabase.cxx" "proddb/ProductionDatabase.h" "proddb/ProductionDatabaseApdStorage.cxx" "proddb/ProductionDatabaseApdStorage.h")
@@ -19,6 +19,7 @@ add_executable(getLocations "getlocations.cpp")
 add_executable(getU100 "getu100.cxx")
 add_executable(makeSerialList "makeseriallist.cxx")
 add_executable(getIrradiationDose "getirradiationstatus.cxx")
+
 add_executable(testXmlStructure "testxmlstructure.cxx")
 
 target_link_libraries(toolbox Qt5::Network Qt5::Core Qt5::Xml proddbaccess)