version

* Modified Jungfrau speed settings for HW1.0 - FW fix version 1.1.1, compilation date 210218

* Corrected bug. DBIT clk phase is implemented in both HW version 1.0 and 2.0. Previous version did not update the DBIT phase shift on the configuration of a speed.

The new server has been compiled

Co-authored-by: lopez_c <carlos.lopez-cuenca@psi.ch>

CMakeLists.txt

@@ -157,37 +157,8 @@ set(CMAKE_INSTALL_RPATH $ORIGIN)
 set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
 
 
-set(ZeroMQ_HINT "" CACHE STRING "Hint where ZeroMQ could be found")
-#Adapted from: https://github.com/zeromq/cppzmq/
-if (NOT TARGET libzmq)
-    if(ZeroMQ_HINT)
-        message(STATUS "Looking for ZeroMQ in: ${ZeroMQ_HINT}")
-        find_package(ZeroMQ 4 
-            NO_DEFAULT_PATH
-            HINTS ${ZeroMQ_DIR}
-        )
-    else()
-        find_package(ZeroMQ 4)
-    endif()
 
-
+find_package(ZeroMQ 4 REQUIRED)
-
-  # libzmq autotools install: fallback to pkg-config
-  if(NOT ZeroMQ_FOUND)
-    message(STATUS "CMake libzmq package not found, trying again with pkg-config (normal install of zeromq)")
-    list (APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/libzmq-pkg-config)
-    find_package(ZeroMQ 4 REQUIRED)
-  endif()
-
-  # TODO "REQUIRED" above should already cause a fatal failure if not found, but this doesn't seem to work
-  if(NOT ZeroMQ_FOUND)
-    message(FATAL_ERROR "ZeroMQ was not found, neither as a CMake package nor via pkg-config")
-  endif()
-
-  if (ZeroMQ_FOUND AND NOT TARGET libzmq)
-    message(FATAL_ERROR "ZeroMQ version not supported!")
-  endif()
-endif()
 
 if (SLS_USE_TESTS)
     enable_testing()

RELEASE.txt

@@ -1,13 +1,14 @@
-SLS Detector Package 5.1.0 released on 22.03.2020 (Minor Release)
+SLS Detector Package 5.1.0 released on xx.xx.2020 (Minor Release)
 ===================================================================
 
-This document describes the differences between 5.1.0 and 5.0.1 releases.   
+This document describes the differences between 5.1.0 and 5.x.x releases.   
 
 
 
     CONTENTS
     --------
-    1.  New Features
+    1.  Topics Concerning
+    2.  New Features
     2.  Resolved Issues
     3.  Known Issues
     4.  Firmware Requirements
@@ -15,17 +16,24 @@ This document describes the differences between 5.1.0 and 5.0.1 releases.
 
 
 
+1. Topics Concerning
+====================
 
-1. New Features
+    - potentital memory leak in receiver
+    - scanParameters in Python
+    - cmk.sh refactored
+    - m3 settings and threshold
+
+
+2. New Features
 ===============
 
     Client
     ------
 
-    1. Added settings and threshold features for Mythen3.
+    1. Aded settings and threshold features for Mythen3.
     2. Internal modification of acquire for Mythen3.
-    3. Added getMaster for Mythen3
+    3. Added getMaster functio for M3
-    4. Mythen3, API function to set pattern from memory
 
 
     Mythen3 server
@@ -34,7 +42,7 @@ This document describes the differences between 5.1.0 and 5.0.1 releases.
     1. Setting timing to auto, sets timing to trigger for slaves
     
 
-2. Resolved Issues
+3. Resolved Issues
 ==================
 
 
@@ -44,7 +52,6 @@ This document describes the differences between 5.1.0 and 5.0.1 releases.
     1.  Current code only calls Implementation::setDetectorType from constructor, 
 	    but potential memory leak if called out of constructor context. Fixed.
 
-
     Client
     ------
 
@@ -52,36 +59,25 @@ This document describes the differences between 5.1.0 and 5.0.1 releases.
 
     2.  cmk.sh refactored to have better option handling
 
-    3.  Fixed hardcoded path accidentally ending up in the exported CMake package
-
-    Server
-    --------
-
-    1.  Bottom port not mirrored correctly for Eiger quad
 
 
 
 
-
+4. Firmware Requirements
-3. Firmware Requirements
 ========================
         
-    Mythen3: 0x210201
+    No updates from 5.0.0
-    Jungfrau: 0x210218 (1.0 pcb)
-              0x200721 (2.0 pcb, not changed)
-
-    Other detectors no updates from 5.0.0
 
 
 
-4. Known Issues
+5. Known Issues
 ===============
 
     No updates from 5.0.0
 
 
 
-5. Download, Documentation & Support
+6. Download, Documentation & Support
 ====================================
 
     Download

cmake/FindZeroMQ.cmake

@@ -0,0 +1,112 @@
+
+# This file is originally from https://github.com/zeromq/azmq and distributed 
+# under Boost Software Lincese 1.0
+# Boost Software License - Version 1.0 - August 17th, 2003
+
+# Permission is hereby granted, free of charge, to any person or organization
+# obtaining a copy of the software and accompanying documentation covered by
+# this license (the "Software") to use, reproduce, display, distribute,
+# execute, and transmit the Software, and to prepare derivative works of the
+# Software, and to permit third-parties to whom the Software is furnished to
+# do so, all subject to the following:
+
+# The copyright notices in the Software and this entire statement, including
+# the above license grant, this restriction and the following disclaimer,
+# must be included in all copies of the Software, in whole or in part, and
+# all derivative works of the Software, unless such copies or derivative
+# works are solely in the form of machine-executable object code generated by
+# a source language processor.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+# SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+# FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+# --------------------------------------------------------------------------------
+
+# Find ZeroMQ Headers/Libs
+
+# Variables
+# ZMQ_ROOT - set this to a location where ZeroMQ may be found
+#
+# ZeroMQ_FOUND - True of ZeroMQ found
+# ZeroMQ_INCLUDE_DIRS - Location of ZeroMQ includes
+# ZeroMQ_LIBRARIES - ZeroMQ libraries
+
+include(FindPackageHandleStandardArgs)
+
+if (NOT ZMQ_ROOT)
+    set(ZMQ_ROOT "$ENV{ZMQ_ROOT}")
+endif()
+
+if (NOT ZMQ_ROOT)
+    find_path(_ZeroMQ_ROOT NAMES include/zmq.h)
+else()
+    set(_ZeroMQ_ROOT "${ZMQ_ROOT}")
+endif()
+
+find_path(ZeroMQ_INCLUDE_DIRS NAMES zmq.h HINTS ${_ZeroMQ_ROOT}/include)
+
+if (ZeroMQ_INCLUDE_DIRS)
+    set(_ZeroMQ_H ${ZeroMQ_INCLUDE_DIRS}/zmq.h)
+
+    function(_zmqver_EXTRACT _ZeroMQ_VER_COMPONENT _ZeroMQ_VER_OUTPUT)
+        set(CMAKE_MATCH_1 "0")
+        set(_ZeroMQ_expr "^[ \\t]*#define[ \\t]+${_ZeroMQ_VER_COMPONENT}[ \\t]+([0-9]+)$")
+        file(STRINGS "${_ZeroMQ_H}" _ZeroMQ_ver REGEX "${_ZeroMQ_expr}")
+        string(REGEX MATCH "${_ZeroMQ_expr}" ZeroMQ_ver "${_ZeroMQ_ver}")
+        set(${_ZeroMQ_VER_OUTPUT} "${CMAKE_MATCH_1}" PARENT_SCOPE)
+    endfunction()
+
+    _zmqver_EXTRACT("ZMQ_VERSION_MAJOR" ZeroMQ_VERSION_MAJOR)
+    _zmqver_EXTRACT("ZMQ_VERSION_MINOR" ZeroMQ_VERSION_MINOR)
+    _zmqver_EXTRACT("ZMQ_VERSION_PATCH" ZeroMQ_VERSION_PATCH)
+
+    message(STATUS "ZeroMQ version: ${ZeroMQ_VERSION_MAJOR}.${ZeroMQ_VERSION_MINOR}.${ZeroMQ_VERSION_PATCH}")
+
+    # We should provide version to find_package_handle_standard_args in the same format as it was requested,
+    # otherwise it can't check whether version matches exactly.
+    if (ZeroMQ_FIND_VERSION_COUNT GREATER 2)
+        set(ZeroMQ_VERSION "${ZeroMQ_VERSION_MAJOR}.${ZeroMQ_VERSION_MINOR}.${ZeroMQ_VERSION_PATCH}")
+    else()
+        # User has requested ZeroMQ version without patch part => user is not interested in specific patch =>
+        # any patch should be an exact match.
+        set(ZeroMQ_VERSION "${ZeroMQ_VERSION_MAJOR}.${ZeroMQ_VERSION_MINOR}")
+    endif()
+
+    if (NOT ${CMAKE_CXX_PLATFORM_ID} STREQUAL "Windows")
+        find_library(ZeroMQ_LIBRARIES NAMES zmq HINTS ${_ZeroMQ_ROOT}/lib)
+    else()
+        find_library(
+            ZeroMQ_LIBRARY_RELEASE
+            NAMES
+                libzmq
+                "libzmq-${CMAKE_VS_PLATFORM_TOOLSET}-mt-${ZeroMQ_VERSION_MAJOR}_${ZeroMQ_VERSION_MINOR}_${ZeroMQ_VERSION_PATCH}"
+            HINTS
+                ${_ZeroMQ_ROOT}/lib
+            )
+
+        find_library(
+            ZeroMQ_LIBRARY_DEBUG
+            NAMES
+                libzmq_d
+                "libzmq-${CMAKE_VS_PLATFORM_TOOLSET}-mt-gd-${ZeroMQ_VERSION_MAJOR}_${ZeroMQ_VERSION_MINOR}_${ZeroMQ_VERSION_PATCH}"
+            HINTS
+                ${_ZeroMQ_ROOT}/lib)
+
+        # On Windows we have to use corresponding version (i.e. Release or Debug) of ZeroMQ because of `errno` CRT global variable
+        # See more at http://www.drdobbs.com/avoiding-the-visual-c-runtime-library/184416623
+        set(ZeroMQ_LIBRARIES optimized "${ZeroMQ_LIBRARY_RELEASE}" debug "${ZeroMQ_LIBRARY_DEBUG}")
+    endif()
+endif()
+
+find_package_handle_standard_args(ZeroMQ FOUND_VAR ZeroMQ_FOUND
+    REQUIRED_VARS ZeroMQ_INCLUDE_DIRS ZeroMQ_LIBRARIES
+    VERSION_VAR ZeroMQ_VERSION)
+
+if (ZeroMQ_FOUND)
+    mark_as_advanced(ZeroMQ_INCLUDE_DIRS ZeroMQ_LIBRARIES ZeroMQ_VERSION
+        ZeroMQ_VERSION_MAJOR ZeroMQ_VERSION_MINOR ZeroMQ_VERSION_PATCH)
+endif()

cmake/package_config.cmake

@@ -25,12 +25,6 @@ install(FILES
   DESTINATION ${CMAKE_INSTALL_DIR}
 )
 
-install(FILES
-  "${CMAKE_SOURCE_DIR}/libzmq-pkg-config/FindZeroMQ.cmake"
-  COMPONENT devel
-  DESTINATION ${CMAKE_INSTALL_DIR}/libzmq-pkg-config
-)
-
 if (PROJECT_LIBRARIES OR PROJECT_STATIC_LIBRARIES)
   install(
     EXPORT "${TARGETS_EXPORT_NAME}"

cmake/project-config.cmake.in

@@ -12,21 +12,8 @@ include(CMakeFindDependencyMacro)
 
 set(SLS_USE_HDF5 "@SLS_USE_HDF5@")
 
-
-find_package(ZeroMQ 4 QUIET)
-# libzmq autotools install: fallback to pkg-config
-if(NOT ZeroMQ_FOUND)
-    list (APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/libzmq-pkg-config)
-    find_package(ZeroMQ 4 REQUIRED)
-endif()
-
-if(NOT ZeroMQ_FOUND)
-    message(FATAL_ERROR "ZeroMQ was NOT found!")
-endif()
-
-find_dependency(Threads)
-
 # Add optional dependencies here
+find_dependency(Threads)
 if (SLS_USE_HDF5)
     find_dependency(HDF5)
 endif ()

conda-recepie/build.sh

@@ -13,9 +13,8 @@ cmake .. \
       -DCMAKE_BUILD_TYPE=Release \
       -DSLS_USE_HDF5=OFF\
      
-NCORES=$(getconf _NPROCESSORS_ONLN)
+
-echo "Building using: ${NCORES} cores"
+cmake --build . -- -j10
-cmake --build . -- -j${NCORES}
 cmake --build . --target install
 
 CTEST_OUTPUT_ON_FAILURE=1 ctest -j 2

conda-recepie/copy_gui.sh

@@ -1,3 +1,3 @@
 #Copy the GUI 
-mkdir -p $PREFIX/bin
+mkdir $PREFIX/bin
-cp build/install/bin/slsDetectorGui $PREFIX/bin/.
+cp build/bin/slsDetectorGui $PREFIX/bin/.

conda-recepie/copy_lib.sh

@@ -1,6 +1,6 @@
 
-mkdir -p $PREFIX/lib
+mkdir $PREFIX/lib
-mkdir -p $PREFIX/bin
+mkdir $PREFIX/bin
 mkdir -p $PREFIX/include/sls
 # mkdir $PREFIX/include/slsDetectorPackage
 

conda-recepie/meta.yaml

@@ -59,16 +59,6 @@ outputs:
     script: copy_lib.sh
 
     requirements:
-      build:
-        - {{ compiler('c') }}
-        - {{compiler('cxx')}}
-        - libstdcxx-ng
-        - libgcc-ng
-        - zeromq
-
-      host:
-        - zeromq
-
       run: 
         - libstdcxx-ng
         - libgcc-ng
@@ -88,8 +78,6 @@ outputs:
 
       host:
         - python
-        - {{ pin_subpackage('slsdetlib', exact=True) }}
-
 
       run:
         - libstdcxx-ng
@@ -106,13 +94,6 @@ outputs:
   - name: slsdetgui
     script: copy_gui.sh
     requirements:
-
-      build:
-        - {{ compiler('c') }}
-        - {{compiler('cxx')}}
-        - {{ pin_subpackage('slsdetlib', exact=True) }}
-        - qwt 6.*
-
       run:
         - {{ pin_subpackage('slsdetlib', exact=True) }}
         - qwt 6.*

libzmq-pkg-config/FindZeroMQ.cmake

@@ -1,27 +0,0 @@
-#From: https://github.com/zeromq/cppzmq/
-set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH ON)
-find_package(PkgConfig)
-pkg_check_modules(PC_LIBZMQ QUIET libzmq)
-
-set(ZeroMQ_VERSION ${PC_LIBZMQ_VERSION})
-find_library(ZeroMQ_LIBRARY NAMES libzmq.so libzmq.dylib libzmq.dll
-             PATHS ${PC_LIBZMQ_LIBDIR} ${PC_LIBZMQ_LIBRARY_DIRS})
-find_library(ZeroMQ_STATIC_LIBRARY NAMES libzmq-static.a libzmq.a libzmq.dll.a
-             PATHS ${PC_LIBZMQ_LIBDIR} ${PC_LIBZMQ_LIBRARY_DIRS})
-
-if(ZeroMQ_LIBRARY OR ZeroMQ_STATIC_LIBRARY)
-    set(ZeroMQ_FOUND ON)
-endif()
-
-if (TARGET libzmq)
-    # avoid errors defining targets twice
-    return()
-endif()
-
-add_library(libzmq SHARED IMPORTED)
-set_property(TARGET libzmq PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${PC_LIBZMQ_INCLUDE_DIRS})
-set_property(TARGET libzmq PROPERTY IMPORTED_LOCATION ${ZeroMQ_LIBRARY})
-
-add_library(libzmq-static STATIC IMPORTED ${PC_LIBZMQ_INCLUDE_DIRS})
-set_property(TARGET libzmq-static PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${PC_LIBZMQ_INCLUDE_DIRS})
-set_property(TARGET libzmq-static PROPERTY IMPORTED_LOCATION ${ZeroMQ_STATIC_LIBRARY})

python/scripts/compile_servers.py

@@ -1,80 +0,0 @@
-import subprocess
-import os
-import sys
-from pathlib import Path
-import shutil as sh
-from argparse import ArgumentParser
-
-class color:
-    HEADER = "\033[95m"
-    BLUE = "\033[94m"
-    CYAN = "\033[96m"
-    GREEN = "\033[92m"
-    YELLOW = "\033[93m"
-    RED = "\033[91m"
-    ENDC = "\033[0m"
-    BOLD = "\033[1m"
-    UNDERLINE = "\033[4m"
-    MAGENTA = "\033[35m"
-
-    @staticmethod
-    def red(s):
-        return f"{color.RED}{s}{color.ENDC}"
-
-    @staticmethod
-    def green(s):
-        return f"{color.GREEN}{s}{color.ENDC}"
-
-def add_to_path():
-    paths = [
-        "/opt/uClinux/bfin-uclinux/bin",
-        "/opt/nios2-gcc/bin",
-        "/opt/eldk-5.1/powerpc-4xx-softfloat/sysroots/i686-eldk-linux/usr/bin/ppc405-linux",
-    ]
-    os.environ["PATH"] += os.pathsep + os.pathsep.join(paths)
-
-
-def rc_to_string(rc):
-    if rc == 0:
-        return color.green("OK")
-    else:
-        return color.red("FAIL")
-
-
-
-parser = ArgumentParser()
-parser.add_argument('-t', '--tag', help = 'Tag added to server file name', default='developer')
-parser.add_argument('-g', '--git', help='Add new servers to the git repo', action="store_true")
-args = parser.parse_args()
-
-
-servers = [
-     "eigerDetectorServer",
-     "jungfrauDetectorServer",
-      "mythen3DetectorServer",
-     "gotthard2DetectorServer",
-     "gotthardDetectorServer",
-     "ctbDetectorServer",
-     "moenchDetectorServer",
-]
-
-
-server_root = Path("../../slsDetectorServers/").resolve()
-
-add_to_path()
-for server in servers:
-    bin_name = f"{server}_{args.tag}"
-    path = server_root / server
-    print(f"{bin_name} - ", end="")
-    os.chdir(path)
-    try: 
-        sh.rmtree(path/'bin')
-    except FileNotFoundError:
-        pass
-    p = subprocess.run(["make"], stdout=subprocess.DEVNULL)
-    print(rc_to_string(p.returncode))
-    if p.returncode == 0:
-        sh.move(f"bin/{server}", f"bin/{bin_name}")
-        if args.git:
-            print("Adding to git")
-            subprocess.run(['git', 'add', 'bin', '-f'])

slsDetectorGui/CMakeLists.txt

@@ -91,6 +91,7 @@ target_include_directories(slsDetectorGui PUBLIC
 
 target_link_libraries(slsDetectorGui PUBLIC
     slsProjectOptions 
+    slsProjectWarnings
     slsDetectorStatic
     ${QT_QTCORE_LIBRARIES}
     ${QT_QTGUI_LIBRARIES}
@@ -100,9 +101,6 @@ target_link_libraries(slsDetectorGui PUBLIC
     Qt4::QtOpenGL
     Qt4::QtSvg
     expat
-    
-    PRIVATE
-    slsProjectWarnings
 )
 
 set_target_properties(slsDetectorGui PROPERTIES
@@ -113,7 +111,7 @@ if(SLS_LTO_AVAILABLE)
 endif()
 
 install(TARGETS slsDetectorGui
-    # EXPORT "${TARGETS_EXPORT_NAME}" #do not export gui
+    EXPORT "${TARGETS_EXPORT_NAME}"
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}

slsDetectorServers/eigerDetectorServer/FebControl.c

@@ -1395,7 +1395,7 @@ int Feb_Control_SetMaster(enum MASTERINDEX ind) {
 int Feb_Control_SetQuad(int val) {
     LOG(logINFO, ("Setting Quad to %d in Feb\n", val));
     // only setting on the right feb if quad
-    return Feb_Control_SetTop(val == 0 ? TOP_HARDWARE : OW_BOTTOM, 0, 1);
+    return Feb_Control_SetTop(val == 0 ? TOP_HARDWARE : OW_TOP, 0, 1);
 }
 
 int Feb_Control_SetReadNLines(int value) {

slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h

@@ -47,7 +47,7 @@
 #define DEFAULT_HIGHGAIN_VRPREAMP (1300)
 #define DEFAULT_STANDARD_VRSHAPER (1280)
 #define DEFAULT_FAST_VRSHAPER     (1500)
-#define DEFAULT_HIGHGAIN_VRSHAPER (1100)
+#define DEFAULT_HIGHGAIN_VRSHAPER (900)
 
 #define DEFAULT_READOUT_C0 (10) //(100000000) // rdo_clk, 100 MHz
 #define DEFAULT_READOUT_C1 (10) //(100000000) // smp sample clk (x2), 100 MHz

slsDetectorSoftware/src/CmdProxy.cpp

@@ -54,7 +54,7 @@ bool CmdProxy::ReplaceIfDepreciated(std::string &command) {
     if (d_it != depreciated_functions.end()) {
         LOG(logWARNING)
             << command
-            << " is deprecated and will be removed. Please migrate to: "
+            << " is depreciated and will be removed. Please migrate to: "
             << d_it->second;
         // insert old command into arguments (for dacs)
         if (d_it->second == "dac") {

slsSupportLib/CMakeLists.txt

@@ -10,6 +10,7 @@ set(SOURCES
     src/ZmqSocket.cpp
     src/UdpRxSocket.cpp
     src/sls_detector_exceptions.cpp
+    # src/sls_detector_defs.cpp
 )
 
 # Header files to install as a part of the library
@@ -56,12 +57,14 @@ target_include_directories(slsSupportObject
   PUBLIC
     "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
     "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
+  PRIVATE
+    ${ZeroMQ_INCLUDE_DIRS}
 )
 
 target_link_libraries(slsSupportObject 
   PUBLIC
     slsProjectOptions 
-    libzmq
+    ${ZeroMQ_LIBRARIES}
     rapidjson
   PRIVATE
     slsProjectWarnings     
@@ -73,6 +76,7 @@ endif(SLS_USE_TESTS)
 
 # Add shared library version of the support lib
 add_library(slsSupportShared SHARED $<TARGET_OBJECTS:slsSupportObject>)
+
 target_link_libraries(slsSupportShared PUBLIC slsSupportObject)
 
 set_target_properties(slsSupportShared PROPERTIES
@@ -104,4 +108,3 @@ install(TARGETS slsSupportShared slsSupportStatic slsSupportObject
     PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sls
 )
 
-

slsSupportLib/include/sls/versionAPI.h

@@ -1,5 +1,5 @@
 /** API versions */
-#define GITBRANCH    "5.1.0"
+#define GITBRANCH    "5.1.0.rc2"
 #define APICTB 0x210225
 #define APIGOTTHARD 0x210225
 #define APIGOTTHARD2 0x210225

tests/CMakeLists.txt

@@ -19,23 +19,21 @@ set_target_properties(testserver PROPERTIES
     
 add_executable(tests ${SLS_TEST_SOURCES})
 target_link_libraries(tests 
-    PUBLIC 
+    slsProjectOptions
-      slsProjectOptions
+    slsProjectWarnings
-      slsSupportShared
+    slsSupportShared
-      pthread
+    pthread
-      rt
+    rt
-    PRIVATE
-      slsProjectWarnings
 )  
 
 if (SLS_USE_TEXTCLIENT)
-    target_link_libraries(tests PUBLIC
+    target_link_libraries(tests
         slsDetectorShared
     )
 endif (SLS_USE_TEXTCLIENT)
 
 if (SLS_USE_RECEIVER)
-    target_link_libraries(tests PUBLIC
+    target_link_libraries(tests
         slsReceiverShared
     )
 endif (SLS_USE_RECEIVER)