From e5145b878f9de35676085409878a66899d2ee4f2 Mon Sep 17 00:00:00 2001 From: Angelo Mantellini Date: Wed, 30 Jan 2019 12:11:34 +0100 Subject: [HICN-18] first commit of libtransport for windows Change-Id: I3a43b22194aa13ae5de1746e3d4bd9a275070261 Signed-off-by: Angelo Mantellini --- cmake/Modules/BuildMacros.cmake | 0 cmake/Modules/FindAsio.cmake | 0 cmake/Modules/FindGFlags.cmake | 0 cmake/Modules/FindGlog.cmake | 0 cmake/Modules/FindHicnBinaryApi.cmake | 0 cmake/Modules/FindLibEvent.cmake | 0 cmake/Modules/FindLibhicn.cmake | 0 cmake/Modules/FindLibmemif.cmake | 0 cmake/Modules/FindLibparc.cmake | 0 cmake/Modules/FindLibtransport.cmake | 0 cmake/Modules/FindLongBow.cmake | 0 cmake/Modules/FindPThread.cmake | 58 +++++++++++++++++++++++++++++++++++ cmake/Modules/FindUncrustify.cmake | 0 cmake/Modules/FindVpp.cmake | 0 cmake/Modules/IosMacros.cmake | 0 cmake/Modules/Packager.cmake | 0 cmake/Modules/WindowsMacros.cmake | 33 ++++++++++++++++++++ cmake/Modules/detectCacheSize.cmake | 0 18 files changed, 91 insertions(+) mode change 100755 => 100644 cmake/Modules/BuildMacros.cmake mode change 100755 => 100644 cmake/Modules/FindAsio.cmake mode change 100755 => 100644 cmake/Modules/FindGFlags.cmake mode change 100755 => 100644 cmake/Modules/FindGlog.cmake mode change 100755 => 100644 cmake/Modules/FindHicnBinaryApi.cmake mode change 100755 => 100644 cmake/Modules/FindLibEvent.cmake mode change 100755 => 100644 cmake/Modules/FindLibhicn.cmake mode change 100755 => 100644 cmake/Modules/FindLibmemif.cmake mode change 100755 => 100644 cmake/Modules/FindLibparc.cmake mode change 100755 => 100644 cmake/Modules/FindLibtransport.cmake mode change 100755 => 100644 cmake/Modules/FindLongBow.cmake create mode 100644 cmake/Modules/FindPThread.cmake mode change 100755 => 100644 cmake/Modules/FindUncrustify.cmake mode change 100755 => 100644 cmake/Modules/FindVpp.cmake mode change 100755 => 100644 cmake/Modules/IosMacros.cmake mode change 100755 => 100644 cmake/Modules/Packager.cmake create mode 100644 cmake/Modules/WindowsMacros.cmake mode change 100755 => 100644 cmake/Modules/detectCacheSize.cmake (limited to 'cmake') diff --git a/cmake/Modules/BuildMacros.cmake b/cmake/Modules/BuildMacros.cmake old mode 100755 new mode 100644 diff --git a/cmake/Modules/FindAsio.cmake b/cmake/Modules/FindAsio.cmake old mode 100755 new mode 100644 diff --git a/cmake/Modules/FindGFlags.cmake b/cmake/Modules/FindGFlags.cmake old mode 100755 new mode 100644 diff --git a/cmake/Modules/FindGlog.cmake b/cmake/Modules/FindGlog.cmake old mode 100755 new mode 100644 diff --git a/cmake/Modules/FindHicnBinaryApi.cmake b/cmake/Modules/FindHicnBinaryApi.cmake old mode 100755 new mode 100644 diff --git a/cmake/Modules/FindLibEvent.cmake b/cmake/Modules/FindLibEvent.cmake old mode 100755 new mode 100644 diff --git a/cmake/Modules/FindLibhicn.cmake b/cmake/Modules/FindLibhicn.cmake old mode 100755 new mode 100644 diff --git a/cmake/Modules/FindLibmemif.cmake b/cmake/Modules/FindLibmemif.cmake old mode 100755 new mode 100644 diff --git a/cmake/Modules/FindLibparc.cmake b/cmake/Modules/FindLibparc.cmake old mode 100755 new mode 100644 diff --git a/cmake/Modules/FindLibtransport.cmake b/cmake/Modules/FindLibtransport.cmake old mode 100755 new mode 100644 diff --git a/cmake/Modules/FindLongBow.cmake b/cmake/Modules/FindLongBow.cmake old mode 100755 new mode 100644 diff --git a/cmake/Modules/FindPThread.cmake b/cmake/Modules/FindPThread.cmake new file mode 100644 index 000000000..6f0eeb7c0 --- /dev/null +++ b/cmake/Modules/FindPThread.cmake @@ -0,0 +1,58 @@ +# Copyright (c) 2019 Cisco and/or its affiliates. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +######################################## +# +# Find the PThread libraries and includes +# This module sets: +# PTHREAD_FOUND: True if pthread was found +# PTHREADR_LIBRARY: The pthread library +# PTHREAD_LIBRARIES: The pthread library and dependencies +# PTHREAD_INCLUDE_DIR: The pthread include dir +# + + +set(PTHREAD_SEARCH_PATH_LIST + ${PTHREAD_HOME} + $ENV{PTHREAD_HOME} + /usr/local + /opt + /usr +) + +find_path(PTHREAD_INCLUDE_DIR pthread.h + HINTS ${PTHREAD_SEARCH_PATH_LIST} + PATH_SUFFIXES include + DOC "Find the pthreadincludes" +) + +if(CMAKE_SIZEOF_VOID_P EQUAL 8) + find_library(PTHREAD_LIBRARY NAMES pthreadVC2.lib + HINTS ${PTHREAD_SEARCH_PATH_LIST} + PATH_SUFFIXES lib/x64 + DOC "Find the pthread libraries" + ) +elseif(CMAKE_SIZEOF_VOID_P EQUAL 4) + find_library(PTHREAD_LIBRARY NAMES pthreadVC2.lib + HINTS ${PTHREAD_SEARCH_PATH_LIST} + PATH_SUFFIXES lib/x32 + DOC "Find the pthread libraries" + ) +endif() + + +set(PTHREAD_LIBRARIES ${PTHREAD_LIBRARY}) +set(PTHREAD_INCLUDE_DIRS ${PTHREAD_INCLUDE_DIR}) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(Pthread DEFAULT_MSG PTHREAD_LIBRARIES PTHREAD_INCLUDE_DIRS) \ No newline at end of file diff --git a/cmake/Modules/FindUncrustify.cmake b/cmake/Modules/FindUncrustify.cmake old mode 100755 new mode 100644 diff --git a/cmake/Modules/FindVpp.cmake b/cmake/Modules/FindVpp.cmake old mode 100755 new mode 100644 diff --git a/cmake/Modules/IosMacros.cmake b/cmake/Modules/IosMacros.cmake old mode 100755 new mode 100644 diff --git a/cmake/Modules/Packager.cmake b/cmake/Modules/Packager.cmake old mode 100755 new mode 100644 diff --git a/cmake/Modules/WindowsMacros.cmake b/cmake/Modules/WindowsMacros.cmake new file mode 100644 index 000000000..20f872759 --- /dev/null +++ b/cmake/Modules/WindowsMacros.cmake @@ -0,0 +1,33 @@ +# Copyright (c) 2017-2019 Cisco and/or its affiliates. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if(WIN32) + find_package_wrapper(LibEvent REQUIRED) + find_package_wrapper(OpenSSL REQUIRED) + find_package_wrapper(PThread REQUIRED) + find_library(WSOCK32_LIBRARY wsock32 required) + find_library(WS2_32_LIBRARY ws2_32 required) + list(APPEND WINDOWS_LIBRARIES + ${LIBEVENT_LIBRARIES} + ${OPENSSL_LIBRARIES} + ${PTHREAD_LIBRARIES} + ${WSOCK32_LIBRARY} + ${WS2_32_LIBRARY} + ) + + list(APPEND WINDOWS_INCLUDE_DIRS + ${LIBEVENT_INCLUDE_DIRS} + ${OPENSSL_INCLUDE_DIR} + ${PTHREAD_INCLUDE_DIRS} + ) +endif() \ No newline at end of file diff --git a/cmake/Modules/detectCacheSize.cmake b/cmake/Modules/detectCacheSize.cmake old mode 100755 new mode 100644 -- cgit 1.2.3-korg