Merge pull request #758 from t-b/allow-turning-shared-library-buildin…

…g-off

Allow turning shared library building off

.travis.yml

@@ -11,11 +11,13 @@ env:
     - USE_PCH=ON
     - CMAKE_BUILD_TYPE=Debug
     - TANGO_USE_USING_NAMESPACE=ON
+    - BUILD_SHARED_LIBS=ON
   matrix:
     - OS_TYPE=llvm-latest RUN_TESTS=OFF WARNINGS_AS_ERRORS=ON TANGO_USE_USING_NAMESPACE=OFF USE_PCH=OFF
     - OS_TYPE=gcc-latest RUN_TESTS=OFF WARNINGS_AS_ERRORS=ON TANGO_USE_USING_NAMESPACE=OFF USE_PCH=OFF
     - OS_TYPE=ubuntu-20.04
     - OS_TYPE=debian10
+    - OS_TYPE=debian10 RUN_TESTS=OFF BUILD_SHARED_LIBS=OFF
     - OS_TYPE=debian10 USE_PCH=OFF RUN_TESTS=OFF
     - OS_TYPE=debian10 CMAKE_BUILD_TYPE=Release
     - OS_TYPE=debian9

.travis/run.sh

@@ -8,6 +8,7 @@ echo "OS_TYPE=$OS_TYPE"
 echo "TANGO_HOST=$TANGO_HOST"
 echo "COVERALLS=$COVERALLS"
 echo "USE_PCH=$USE_PCH"
+echo "BUILD_SHARED_LIBS=$BUILD_SHARED_LIBS"
 echo "TANGO_USE_USING_NAMESPACE=$TANGO_USE_USING_NAMESPACE"
 echo "WARNINGS_AS_ERRORS=$WARNINGS_AS_ERRORS"
 echo "############################"
@@ -18,12 +19,14 @@ docker exec cpp_tango mkdir -p /home/tango/src/build
 MAKEFLAGS=${MAKEFLAGS:- -j $(nproc)}
 COVERALLS=${COVERALLS:-OFF}
 USE_PCH=${USE_PCH:-OFF}
+BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-ON}
 WARNINGS_AS_ERRORS=${WARNINGS_AS_ERRORS:-OFF}
 COVERALLS_MODULE_PATH=/home/tango/coveralls-cmake/cmake
 
 docker exec cpp_tango cmake                                \
   -H/home/tango/src                                        \
   -B/home/tango/src/build                                  \
+  -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}                 \
   -DCMAKE_VERBOSE_MAKEFILE=ON                              \
   -DCPPZMQ_BASE=/home/tango                                \
   -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}                   \

CMakeLists.txt

@@ -12,6 +12,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 include(CTest)
 
 option(WARNINGS_AS_ERRORS "Treat compiler warnings as errors" OFF)
+option(BUILD_SHARED_LIBS "Build a shared library instead of static" ON)
 
 option(USE_PCH "Use precompiled header for server/tango.h" OFF)
 if (USE_PCH AND NOT (CMAKE_CXX_COMPILER_ID MATCHES "GNU|MSVC|Clang"))
@@ -52,14 +53,19 @@ add_subdirectory("log4tango")
 add_subdirectory("cppapi")
 
 if(BUILD_TESTING)
+  if(BUILD_SHARED_LIBS)
     add_subdirectory("cpp_test_suite")
+  else()
+    message(WARNING "Not building the tests, because that is currently supported only when BUILD_SHARED_LIBS is ON")
+    SET(BUILD_TESTING OFF)
+  endif()
 endif()
 
 if(WIN32)
     include(configure/cmake_win.cmake)
     include(configure/cpack_win.cmake)
-else(WIN32)
+else()
     include(configure/cmake_linux.cmake)
-endif(WIN32)
+endif()
 
 include(CPack)

INSTALL.md

@@ -29,6 +29,7 @@
 - `-DTANGO_USE_USING_NAMESPACE=<ON|OFF>` choose `OFF` for modern builds
 - `-DUSE_PCH=<ON|OFF>`
 - `-DBUILD_TESTING=<ON|OFF>` Build the test suite (`ON` by default)
+- `-DBUILD_SHARED_LIBS=<ON|OFF>` Build tango as shared library (`ON` by default)
 
 Typical output:
 

appveyor.yml

@@ -126,10 +126,10 @@ install:
   #- cmd: cmake -G "%CMAKE_GENERATOR%" -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE -
   # Static builds
   - cmd: cd c:/projects/static_build
-  - cmd: cmake -G "%CMAKE_GENERATOR%" -DTANGO_BUILD_SHARED=OFF -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DCMAKE_CXX_FLAGS_RELEASE="/MT" -DCMAKE_CXX_FLAGS_DEBUG="/MTd" -DIDL_BASE="%IDL_BASE%" -DOMNI_BASE="%OMNI_BASE%" -DZMQ_BASE="%ZMQ_BASE%" -DCPPZMQ_BASE="%CPPZMQ_BASE%" -DPTHREAD_WIN=%PTHREAD_WIN% -DUSE_PCH=%USE_PCH% -DBUILD_TESTING=OFF ../cppTango
+  - cmd: cmake -G "%CMAKE_GENERATOR%" -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DCMAKE_CXX_FLAGS_RELEASE="/MT" -DCMAKE_CXX_FLAGS_DEBUG="/MTd" -DIDL_BASE="%IDL_BASE%" -DOMNI_BASE="%OMNI_BASE%" -DZMQ_BASE="%ZMQ_BASE%" -DCPPZMQ_BASE="%CPPZMQ_BASE%" -DPTHREAD_WIN=%PTHREAD_WIN% -DUSE_PCH=%USE_PCH% -DBUILD_TESTING=OFF ../cppTango
   # Dynamic builds
   - cmd: cd c:/projects/dynamic_build
-  - cmd: cmake -G "%CMAKE_GENERATOR%" -DTANGO_BUILD_SHARED=ON -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE  -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DIDL_BASE="%IDL_BASE%" -DOMNI_BASE="%OMNI_BASE%" -DZMQ_BASE="%ZMQ_BASE%" -DCPPZMQ_BASE="%CPPZMQ_BASE%" -DPTHREAD_WIN=%PTHREAD_WIN% -DUSE_PCH=OFF -DBUILD_TESTING=OFF ../cppTango
+  - cmd: cmake -G "%CMAKE_GENERATOR%" -DBUILD_SHARED_LIBS=ON -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE  -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DIDL_BASE="%IDL_BASE%" -DOMNI_BASE="%OMNI_BASE%" -DZMQ_BASE="%ZMQ_BASE%" -DCPPZMQ_BASE="%CPPZMQ_BASE%" -DPTHREAD_WIN=%PTHREAD_WIN% -DUSE_PCH=OFF -DBUILD_TESTING=OFF ../cppTango
 
 clone_folder: C:\projects\cppTango
 

configure/CMakeLists.txt

@@ -11,12 +11,12 @@ set(PLATFORM 32)
 if(WIN32)
     if(CMAKE_CL_64)
         set(PLATFORM 64)
-    endif(CMAKE_CL_64)
-else(WIN32)
+    endif()
+else()
     if(${CMAKE_SIZEOF_VOID_P} EQUAL 8)
         set(PLATFORM 64)
     endif()
-endif(WIN32)
+endif()
 
 message(STATUS "CMake: version ${CMAKE_VERSION}")
 message(STATUS "Target platform: ${CMAKE_SYSTEM_NAME} ${PLATFORM}-bit")
@@ -33,14 +33,14 @@ endif()
 if(CPPZMQ_BASE)
     message("Using CPPZMQ_BASE=${CPPZMQ_BASE}")
     include_directories(${CPPZMQ_BASE}/include)
-endif(CPPZMQ_BASE)
+endif()
 
 if(IDL_BASE)
     message("Using IDL_BASEIDL_BASE=${IDL_BASE}")
     set(IDL_PKG_INCLUDE_DIRS ${IDL_BASE}/include)
-else(IDL_BASE)
+else()
     pkg_search_module(IDL_PKG REQUIRED tangoidl)
-endif(IDL_BASE)
+endif()
 
 if(OMNI_BASE)
     message("Using OMNI_BASE=${OMNI_BASE}")
@@ -56,13 +56,13 @@ if(OMNI_BASE)
             set(OMNIORB_PKG_LIBRARIES_DYN "omniORB4_rt.lib;omniDynamic4_rt.lib;omnithread_rt.lib;COS4_rt.lib")
             set(OMNIORB_PKG_LIBRARIES_STA "omniORB4.lib;omniDynamic4.lib;omnithread.lib;COS4.lib")
         endif()
-    else(WIN32)
+    else()
         set(OMNIIDL_PATH ${OMNI_BASE}/bin/)
         include_directories(${OMNI_BASE}/include)
         link_directories(${OMNI_BASE}/lib)
         set(OMNIORB_PKG_LIBRARIES "-lomniORB4 -lomnithread -lCOS4 -lomniDynamic4")
-    endif(WIN32)
-else(OMNI_BASE)
+    endif()
+else()
     #CORBA
     pkg_search_module(OMNIORB_PKG REQUIRED omniORB4)
     #COS
@@ -72,7 +72,7 @@ else(OMNI_BASE)
     if(NOT OMNIORB_PKG_FOUND)
         message(FATAL_ERROR "omniORB4 library is required for Tango")
     endif()
-endif(OMNI_BASE)
+endif()
 
 if(ZMQ_BASE)
     message("Using ZMQ_BASE=${ZMQ_BASE}")
@@ -86,31 +86,31 @@ if(ZMQ_BASE)
             if(CMAKE_BUILD_TYPE STREQUAL "Debug")
                 set(ZMQ_PKG_LIBRARIES_STA "libzmq-v140-mt-sgd-4_0_5.lib")
                 set(ZMQ_PKG_LIBRARIES_DYN "libzmq-v140-mt-gd-4_0_5.lib")
-            else(CMAKE_BUILD_TYPE STREQUAL "Debug")
+            else()
                 set(ZMQ_PKG_LIBRARIES_STA "libzmq-v140-mt-s-4_0_5.lib")
                 set(ZMQ_PKG_LIBRARIES_DYN "libzmq-v140-mt-4_0_5.lib")
-            endif(CMAKE_BUILD_TYPE STREQUAL "Debug")
-        endif(CMAKE_VS_PLATFORM_TOOLSET STREQUAL "v140")
+            endif()
+        endif()
         if(CMAKE_VS_PLATFORM_TOOLSET STREQUAL "v141")
             if(CMAKE_BUILD_TYPE STREQUAL "Debug")
                 set(ZMQ_PKG_LIBRARIES_STA "libzmq-v141-mt-sgd-4_0_5.lib")
                 set(ZMQ_PKG_LIBRARIES_DYN "libzmq-v141-mt-gd-4_0_5.lib")
-            else(CMAKE_BUILD_TYPE STREQUAL "Debug")
+            else()
                 set(ZMQ_PKG_LIBRARIES_STA "libzmq-v141-mt-s-4_0_5.lib")
                 set(ZMQ_PKG_LIBRARIES_DYN "libzmq-v141-mt-4_0_5.lib")
-            endif(CMAKE_BUILD_TYPE STREQUAL "Debug")
-        endif(CMAKE_VS_PLATFORM_TOOLSET STREQUAL "v141")
+            endif()
+        endif()
     else()
         set(ZMQ_PKG_LIBRARIES "-lzmq")
         link_directories(${ZMQ_BASE}/lib)
     endif()
     include_directories(${ZMQ_BASE}/include)
-else(ZMQ_BASE)
+else()
     pkg_search_module(ZMQ_PKG REQUIRED libzmq)
     if(NOT ZMQ_PKG_FOUND)
         message(FATAL_ERROR "ZMQ library is required for Tango")
     endif()
-endif(ZMQ_BASE)
+endif()
 
 if(PTHREAD_WIN)
     message("Using PTHREAD_WIN=${PTHREAD_WIN}")
@@ -124,7 +124,7 @@ if(PTHREAD_WIN)
         set(PTHREAD_WIN_PKG_LIBRARIES_DYN "pthreadVC2.lib")
         set(PTHREAD_WIN_PKG_LIBRARIES_STA "pthreadVC2-s.lib")
     endif()
-endif(PTHREAD_WIN)
+endif()
 
 #####  Ensure zmq.hpp file is present #####
 include(CheckIncludeFileCXX)
@@ -152,7 +152,7 @@ if(NOT WIN32)
 else()
   set(TANGO_ZMQ_HAS_DISCONNECT TRUE)
   message(STATUS "Check if zmq::socket has a disconnect method: ${TANGO_ZMQ_HAS_DISCONNECT} (hardcoded)")
-endif(NOT WIN32)
+endif()
 
 message("Verifying ${OMNIIDL_PATH}omniidl")
 if(WIN32)

configure/cmake_linux.cmake

@@ -1,35 +1,25 @@
 project(libtango)
 
-add_library(tango SHARED    $<TARGET_OBJECTS:log4tango_objects>
-                            $<TARGET_OBJECTS:client_objects>
-                            $<TARGET_OBJECTS:idl_objects>
-                            $<TARGET_OBJECTS:jpeg_objects>
-                            $<TARGET_OBJECTS:jpeg_mmx_objects>
-                            $<TARGET_OBJECTS:server_objects>)
+add_library(tango $<TARGET_OBJECTS:log4tango_objects>
+                  $<TARGET_OBJECTS:client_objects>
+                  $<TARGET_OBJECTS:idl_objects>
+                  $<TARGET_OBJECTS:jpeg_objects>
+                  $<TARGET_OBJECTS:jpeg_mmx_objects>
+                  $<TARGET_OBJECTS:server_objects>)
 target_link_libraries(tango PUBLIC ${ZMQ_PKG_LIBRARIES} ${OMNIORB_PKG_LIBRARIES} ${OMNICOS_PKG_LIBRARIES} ${OMNIDYN_PKG_LIBRARIES} ${CMAKE_DL_LIBS})
-target_compile_options(tango PRIVATE -fPIC)
 target_include_directories(tango PUBLIC ${ZMQ_PKG_INCLUDE_DIRS} ${OMNIORB_PKG_INCLUDE_DIRS} ${OMNIDYN_PKG_INCLUDE_DIRS})
-
 target_compile_options(tango PUBLIC ${ZMQ_PKG_CFLAGS_OTHER} ${OMNIORB_PKG_CFLAGS_OTHER} ${OMNICOS_PKG_CFLAGS_OTHER} ${OMNIDYN_PKG_CFLAGS_OTHER})
-target_compile_definitions(tango PUBLIC _REENTRANT)
-
-set_target_properties(tango PROPERTIES
-                      VERSION ${LIBRARY_VERSION}
-                      SOVERSION ${SO_VERSION})
-
-add_library(tango-static STATIC $<TARGET_OBJECTS:log4tango_objects>
-                                $<TARGET_OBJECTS:client_objects>
-                                $<TARGET_OBJECTS:idl_objects>
-                                $<TARGET_OBJECTS:jpeg_objects>
-                                $<TARGET_OBJECTS:jpeg_mmx_objects>
-                                $<TARGET_OBJECTS:server_objects>)
-target_link_libraries(tango-static PUBLIC ${ZMQ_PKG_LIBRARIES} ${OMNIORB_PKG_LIBRARIES} ${OMNICOS_PKG_LIBRARIES} ${OMNIDYN_PKG_LIBRARIES} ${CMAKE_DL_LIBS})
-target_include_directories(tango-static PUBLIC ${ZMQ_PKG_INCLUDE_DIRS} ${OMNIORB_PKG_INCLUDE_DIRS} ${OMNIDYN_PKG_INCLUDE_DIRS})
-target_compile_options(tango-static PUBLIC ${ZMQ_PKG_CFLAGS_OTHER} ${OMNIORB_PKG_CFLAGS_OTHER} ${OMNICOS_PKG_CFLAGS_OTHER} ${OMNIDYN_PKG_CFLAGS_OTHER})
-set_target_properties(tango-static PROPERTIES OUTPUT_NAME tango)
 
-install(TARGETS tango LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}")
-install(TARGETS tango-static ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}")
+if(BUILD_SHARED_LIBS)
+  target_compile_options(tango PRIVATE -fPIC)
+  target_compile_definitions(tango PUBLIC _REENTRANT)
+  set_target_properties(tango PROPERTIES
+                        VERSION ${LIBRARY_VERSION}
+                        SOVERSION ${SO_VERSION})
+  install(TARGETS tango LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}")
+else()
+  install(TARGETS tango ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}")
+endif()
 
 configure_file(tango.pc.cmake tango.pc @ONLY)
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/tango.pc"
@@ -42,7 +32,7 @@ find_program(LSB_RELEASE lsb_release)
 if(NOT LSB_RELEASE)
     message(STATUS "Can not find lsb_release in your path, default to jessie.")
     set(LINUX_FLAVOUR jessie)
-endif(NOT LSB_RELEASE)
+endif()
 execute_process(COMMAND ${LSB_RELEASE} -cs
         OUTPUT_VARIABLE LINUX_FLAVOUR
         OUTPUT_STRIP_TRAILING_WHITESPACE)
@@ -53,6 +43,6 @@ if(CURL)
             COMMAND ${CURL} -v -T ${CPACK_PACKAGE_FILE_NAME}.deb -u$ENV{BINTRAY_USER_NAME}:$ENV{BINTRAY_API_KEY} \"https://api.bintray.com/content/tango-controls/debian/cppTango/${LIBRARY_VERSION}/pool/main/libt/${LINUX_FLAVOUR}/${CPACK_PACKAGE_FILE_NAME}.deb\;deb_distribution=${LINUX_FLAVOUR}\;deb_component=main\;deb_architecture=${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}\;publish=1\;override=1\"
             WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
             DEPENDS ${PROJECT_BINARY_DIR}/${CPACK_PACKAGE_FILE_NAME}.deb)
-elseif(CURL)
+else()
     message(WARNING "curl was not found deploy won't be possible")
-endif(CURL)
+endif()

configure/cmake_pch_linux.cmake

@@ -1,4 +1,3 @@
-
 #
 # Adds precompiled header (generated by the tango_pch target) to the ${target}.
 #

configure/cmake_pch_win.cmake

@@ -1,4 +1,3 @@
-
 function(tango_target_pch target)
 
     set(tango_pch_file "${CMAKE_CURRENT_BINARY_DIR}/pch_${target}.pch")

configure/cmake_win.cmake

@@ -2,7 +2,7 @@ project(tango)
 
 if(CMAKE_CL_64)
     add_definitions(-D_64BITS)
-endif(CMAKE_CL_64)
+endif()
 
 set(TANGO_LIBRARY_NAME tango)
 
@@ -13,10 +13,7 @@ endif()
 # The name without the variant tag (i.e. -static)
 set(TANGO_LIBRARY_OUTPUT_NAME ${TANGO_LIBRARY_NAME})
 
-if (TANGO_BUILD_SHARED)
-    # https://cmake.org/cmake/help/latest/variable/BUILD_SHARED_LIBS.html
-    set(BUILD_SHARED_LIBS ON)
-else()
+if(NOT BUILD_SHARED_LIBS)
     set(TANGO_LIBRARY_NAME ${TANGO_LIBRARY_NAME}-static)
 endif()
 
@@ -32,7 +29,7 @@ include_directories(${PTHREAD_WIN_PKG_INCLUDE_DIRS})
 set(WIN32_LIBS "ws2_32.lib;mswsock.lib;advapi32.lib;comctl32.lib;odbc32.lib;")
 if(PTHREAD_WIN)
     link_directories(${PTHREAD_WIN}/lib)
-endif(PTHREAD_WIN)
+endif()
 
 add_library(${TANGO_LIBRARY_NAME} $<TARGET_OBJECTS:log4tango_objects>
         $<TARGET_OBJECTS:idl_objects>
@@ -46,7 +43,7 @@ set_target_properties(${TANGO_LIBRARY_NAME} PROPERTIES COMPILE_DEFINITIONS
 
 target_compile_options(${TANGO_LIBRARY_NAME} PUBLIC ${ZMQ_PKG_CFLAGS_OTHER} ${OMNIORB_PKG_CFLAGS_OTHER} ${OMNICOS_PKG_CFLAGS_OTHER} ${OMNIDYN_PKG_CFLAGS_OTHER})
 
-if(TANGO_BUILD_SHARED)
+if(BUILD_SHARED_LIBS)
     target_link_libraries(${TANGO_LIBRARY_NAME} PUBLIC ${WIN32_LIBS} ${OMNIORB_PKG_LIBRARIES_DYN} ${ZMQ_PKG_LIBRARIES_DYN} ${PTHREAD_WIN_PKG_LIBRARIES_DYN} ${CMAKE_DL_LIBS})
 else()
     target_link_libraries(${TANGO_LIBRARY_NAME} PUBLIC ${WIN32_LIBS} ${OMNIORB_PKG_LIBRARIES_STA} ${ZMQ_PKG_LIBRARIES_STA} ${PTHREAD_WIN_PKG_LIBRARIES_STA} ${CMAKE_DL_LIBS})
@@ -114,7 +111,7 @@ if (TANGO_INSTALL_DEPENDENCIES)
         install(FILES $ENV{OMNI_BASE}/lib/x86_win32/COS421_rtd.lib DESTINATION lib COMPONENT dynamic)
         install(FILES $ENV{OMNI_BASE}/lib/x86_win32/msvcstubd.lib DESTINATION lib COMPONENT dynamic)
 
-    else(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    else()
 
         #omniorb static lib
         install(FILES $ENV{OMNI_BASE}/lib/x86_win32/omniORB4.lib DESTINATION lib COMPONENT static)
@@ -131,7 +128,7 @@ if (TANGO_INSTALL_DEPENDENCIES)
         install(FILES $ENV{OMNI_BASE}/lib/x86_win32/COS421_rt.lib DESTINATION lib COMPONENT dynamic)
         install(FILES $ENV{OMNI_BASE}/lib/x86_win32/msvcstub.lib DESTINATION lib COMPONENT dynamic)
 
-    endif(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    endif()
 
     if(CMAKE_VS_PLATFORM_TOOLSET STREQUAL "v140")
         if(CMAKE_BUILD_TYPE STREQUAL "Debug")
@@ -142,16 +139,16 @@ if (TANGO_INSTALL_DEPENDENCIES)
             install(FILES $ENV{ZMQ_BASE}/lib/Debug/libzmq-v140-mt-gd-4_0_5.lib DESTINATION lib COMPONENT static)
             install(FILES $ENV{ZMQ_BASE}/lib/Debug/libzmq-v140-mt-sgd-4_0_5.lib DESTINATION lib COMPONENT static)
             install(FILES $ENV{ZMQ_BASE}/bin/Debug/libzmq-v140-mt-gd-4_0_5.dll DESTINATION bin COMPONENT dynamic)
-        else(CMAKE_BUILD_TYPE STREQUAL "Debug")
+        else()
             install(FILES $ENV{OMNI_BASE}/bin/x86_win32/omniORB421_vc14_rt.dll DESTINATION bin COMPONENT dynamic)
             install(FILES $ENV{OMNI_BASE}/bin/x86_win32/omniDynamic421_vc14_rt.dll DESTINATION bin COMPONENT dynamic)
             install(FILES $ENV{OMNI_BASE}/bin/x86_win32/omnithread40_vc14_rt.dll DESTINATION bin COMPONENT dynamic)
             install(FILES $ENV{OMNI_BASE}/bin/x86_win32/COS421_vc14_rt.dll DESTINATION bin COMPONENT dynamic)
             install(FILES $ENV{ZMQ_BASE}/lib/Release/libzmq-v140-mt-4_0_5.lib DESTINATION lib COMPONENT static)
             install(FILES $ENV{ZMQ_BASE}/lib/Release/libzmq-v140-mt-s-4_0_5.lib DESTINATION lib COMPONENT static)
             install(FILES $ENV{ZMQ_BASE}/bin/Release/libzmq-v140-mt-4_0_5.dll DESTINATION bin COMPONENT dynamic)
-        endif(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    endif(CMAKE_VS_PLATFORM_TOOLSET STREQUAL "v140")
+        endif()
+    endif()
 
     if(CMAKE_VS_PLATFORM_TOOLSET STREQUAL "v141")
         if(CMAKE_BUILD_TYPE STREQUAL "Debug")
@@ -162,16 +159,16 @@ if (TANGO_INSTALL_DEPENDENCIES)
             install(FILES $ENV{ZMQ_BASE}/lib/Debug/libzmq-v141-mt-gd-4_0_5.lib DESTINATION lib COMPONENT static)
             install(FILES $ENV{ZMQ_BASE}/lib/Debug/libzmq-v141-mt-sgd-4_0_5.lib DESTINATION lib COMPONENT static)
             install(FILES $ENV{ZMQ_BASE}/bin/Debug/libzmq-v141-mt-gd-4_0_5.dll DESTINATION bin COMPONENT dynamic)
-        else(CMAKE_BUILD_TYPE STREQUAL "Debug")
+        else()
             install(FILES $ENV{OMNI_BASE}/bin/x86_win32/omniORB421_vc15_rt.dll DESTINATION bin COMPONENT dynamic)
             install(FILES $ENV{OMNI_BASE}/bin/x86_win32/omniDynamic421_vc15_rt.dll DESTINATION bin COMPONENT dynamic)
             install(FILES $ENV{OMNI_BASE}/bin/x86_win32/omnithread40_vc15_rt.dll DESTINATION bin COMPONENT dynamic)
             install(FILES $ENV{OMNI_BASE}/bin/x86_win32/COS421_vc15_rt.dll DESTINATION bin COMPONENT dynamic)
             install(FILES $ENV{ZMQ_BASE}/lib/Release/libzmq-v141-mt-4_0_5.lib DESTINATION lib COMPONENT static)
             install(FILES $ENV{ZMQ_BASE}/lib/Release/libzmq-v141-mt-s-4_0_5.lib DESTINATION lib COMPONENT static)
             install(FILES $ENV{ZMQ_BASE}/bin/Release/libzmq-v141-mt-4_0_5.dll DESTINATION bin COMPONENT dynamic)
-        endif(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    endif(CMAKE_VS_PLATFORM_TOOLSET STREQUAL "v141")
+        endif()
+    endif()
 
     #pthreads
     if (PTHREAD_WIN)
@@ -187,7 +184,7 @@ if (TANGO_INSTALL_DEPENDENCIES)
         install(FILES ${PTHREAD_WIN}/bin/pthreadVC2d.pdb DESTINATION bin COMPONENT dynamic)
         install(FILES ${PTHREAD_WIN}/bin/pthreadVC2d.exp DESTINATION bin COMPONENT dynamic)
         install(FILES ${PTHREAD_WIN}/bin/pthreadVC2d.ilk DESTINATION bin COMPONENT dynamic)
-    endif(PTHREAD_WIN)
+    endif()
 endif()
 
 configure_file(tango.pc.cmake tango.pc @ONLY)