Issues #14 and #6

gcontini

2020-02-24 d4edbb5a0aae0211389ce86264809b4237c73769

 src/library/os/CMakeLists.txt

@@ -1,27 +1,37 @@
IF(UNIX OR OPENSSL_FOUND)
    ADD_LIBRARY(os STATIC
        openssl/signature_verifier.cpp
        os.c
        os-linux.c
        network_id.c)

   if (CMAKE_VERSION VERSION_GREATER 3.5)
      target_link_libraries(os base OpenSSL::Crypto ${EXTERNAL_LIBS} ${CMAKE_DL_LIBS})
   #patch for old cmake in Centos 7
   ELSE(CMAKE_VERSION VERSION_GREATER 3.5)
      target_link_libraries(os base ${OPENSSL_CRYPTO_LIBRARY} ${EXTERNAL_LIBS} ${CMAKE_DL_LIBS})
   ENDIF(CMAKE_VERSION VERSION_GREATER 3.5)
   IF(UNIX)
      add_library(os OBJECT
          openssl/signature_verifier.cpp
            execution_environment_common.cpp
          linux/execution_environment.cpp
          cpu_info_common.cpp
          linux/cpu_info.cpp
          linux/network.cpp
          linux/os-linux.c) 
   ELSE(UNIX)
         add_library(os OBJECT 
         cpu_info_common.cpp windows/cpu_info.cpp 
         openssl/signature_verifier.cpp 
        execution_environment_common.cpp windows/execution_environment.cpp
         windows/isvm/Native.cpp
        windows/isvm/BIOSReader.cpp
         windows/os-win.c 
         windows/network.cpp)
   ENDIF(UNIX)
ELSE(UNIX OR OPENSSL_FOUND)
    ADD_LIBRARY(os STATIC
        windows/signature_verifier.cpp
        os.c
        os-win.c)

   target_link_libraries(
        os
        base
        ${EXTERNAL_LIBS} 
   )
#windows no openssl
    add_library(os OBJECT
        cpu_info_common.cpp 
        windows/cpu_info.cpp 
        windows/signature_verifier.cpp 
        execution_environment_common.cpp windows/execution_environment.cpp
        windows/isvm/Native.cpp
        windows/isvm/BIOSReader.cpp
        windows/os-win.c 
        windows/network.cpp)
ENDIF(UNIX OR OPENSSL_FOUND)

install(TARGETS os ARCHIVE DESTINATION lib/${PROJECT_NAME}/${LCC_PROJECT_NAME})
if(CODE_COVERAGE AND UNIX)
     MESSAGE(STATUS "Enabling code coverage")
     target_compile_options(os PUBLIC -O0 -g --coverage)
endif(CODE_COVERAGE AND UNIX)