diff options
Diffstat (limited to 'cmake/Modules')
| -rw-r--r-- | cmake/Modules/BuildMacros.cmake | 15 | ||||
| -rw-r--r-- | cmake/Modules/FindConfig.cmake | 23 | ||||
| -rwxr-xr-x | cmake/Modules/FindLibhicnctrl.cmake | 45 | ||||
| -rw-r--r-- | cmake/Modules/Packager.cmake | 4 |
4 files changed, 83 insertions, 4 deletions
diff --git a/cmake/Modules/BuildMacros.cmake b/cmake/Modules/BuildMacros.cmake index 8125fa7f9..63d54502b 100644 --- a/cmake/Modules/BuildMacros.cmake +++ b/cmake/Modules/BuildMacros.cmake @@ -169,8 +169,16 @@ macro(build_library lib) foreach(file ${ARG_INSTALL_HEADERS}) get_filename_component(_dir ${file} DIRECTORY) - get_filename_component(dir ${_dir} NAME) - if (${dir} STREQUAL src) + + if (_dir) + get_filename_component(dir ${_dir} NAME) + if ("${dir}" STREQUAL src) + set(dir "") + endif() + if ("${dir}" STREQUAL includes) + set(dir "") + endif() + else() set(dir "") endif() @@ -200,3 +208,6 @@ macro(AddTest testFile) set_target_properties(${ARGV0} PROPERTIES FOLDER Test) add_dependencies(${ARGV0} ${PROJECT_NAME}_cleanup_profiling_data) endmacro(AddTest) + +include(IosMacros) +include(WindowsMacros) diff --git a/cmake/Modules/FindConfig.cmake b/cmake/Modules/FindConfig.cmake new file mode 100644 index 000000000..5361d9611 --- /dev/null +++ b/cmake/Modules/FindConfig.cmake @@ -0,0 +1,23 @@ +FIND_PATH(CONFIG_INCLUDE_DIR libconfig.h /usr/include /usr/local/include) + +FIND_LIBRARY(CONFIG_LIBRARY NAMES config PATH /usr/lib /usr/local/lib) + +IF (CONFIG_INCLUDE_DIR AND CONFIG_LIBRARY) + SET(CONFIG_FOUND TRUE) +ENDIF ( CONFIG_INCLUDE_DIR AND CONFIG_LIBRARY) + +IF (CONFIG_FOUND) + IF (NOT CONFIG_FIND_QUIETLY) + MESSAGE(STATUS "Found Config: ${CONFIG_LIBRARY}") + ENDIF (NOT CONFIG_FIND_QUIETLY) +ELSE(CONFIG_FOUND) + IF (Config_FIND_REQUIRED) + IF(NOT CONFIG_INCLUDE_DIR) + MESSAGE(FATAL_ERROR "Could not find LibConfig header file!") + ENDIF(NOT CONFIG_INCLUDE_DIR) + + IF(NOT CONFIG_LIBRARY) + MESSAGE(FATAL_ERROR "Could not find LibConfig library file!") + ENDIF(NOT CONFIG_LIBRARY) + ENDIF (Config_FIND_REQUIRED) +ENDIF (CONFIG_FOUND)
\ No newline at end of file diff --git a/cmake/Modules/FindLibhicnctrl.cmake b/cmake/Modules/FindLibhicnctrl.cmake new file mode 100755 index 000000000..1399b41bf --- /dev/null +++ b/cmake/Modules/FindLibhicnctrl.cmake @@ -0,0 +1,45 @@ +# 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. + +######################################## +# +# Find the hICN control library and include files +# + +set(HICN_SEARCH_PATH_LIST + ${HICN_HOME} + $ENV{HICN_HOME} + $ENV{FOUNDATION_HOME} + /usr/local + /opt + /usr +) + +find_path(LIBHICNCTRL_INCLUDE_DIR hicn/ctrl.h + HINTS ${HICN_SEARCH_PATH_LIST} + PATH_SUFFIXES include + DOC "Find the hICN control include" +) + +find_library(LIBHICNCTRL_LIBRARY NAMES hicn-ctrl + HINTS ${HICN_SEARCH_PATH_LIST} + PATH_SUFFIXES lib + DOC "Find the hicn control library" +) + +set(LIBHICNCTRL_LIBRARIES ${HICNCTRL_LIBRARY}) +set(LIBHICNCTRL_INCLUDE_DIRS ${HICNCTRL_INCLUDE_DIR}) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(hicnctrl DEFAULT_MSG + LIBHICNCTRL_LIBRARY LIBHICNCTRL_INCLUDE_DIR) diff --git a/cmake/Modules/Packager.cmake b/cmake/Modules/Packager.cmake index b4849963d..27a269b88 100644 --- a/cmake/Modules/Packager.cmake +++ b/cmake/Modules/Packager.cmake @@ -84,11 +84,11 @@ macro(make_packages) set(rpm_ver "${tag}-${commit_num}-release") endif() - get_next_version(${tag}, next_version) + get_next_version(${tag} next_version) get_cmake_property(components COMPONENTS) - if(OS_ID_LIKE MATCHES "debian") + if(OS_ID MATCHES "debian" OR OS_ID_LIKE MATCHES "debian") set(CPACK_GENERATOR "DEB") set(type "DEBIAN") |