From 3479e9f2b695b8577949fbb6ab38d4bdfbd419da Mon Sep 17 00:00:00 2001 From: bruneton Date: Tue, 18 Jun 2013 07:43:36 +0000 Subject: [PATCH] CMake: Exposed PThread root directory in config file. --- CMakeLists.txt | 4 ++-- misc/LibBatchConfig.cmake.in | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 70ec6b0..3a0c7c6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -97,7 +97,7 @@ CONFIGURE_PACKAGE_CONFIG_FILE(misc/${PROJECT_NAME}Config.cmake.in ${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake INSTALL_DESTINATION "${INSTALL_CMAKE_CONFIG_DIR}" PATH_VARS CONF_INCLUDE_DIRS INSTALL_CMAKE_CONFIG_DIR CMAKE_INSTALL_PREFIX LIBBATCH_PYTHONPATH - PYTHON_ROOT_DIR SWIG_ROOT_DIR) + PYTHON_ROOT_DIR SWIG_ROOT_DIR PTHREAD_ROOT_DIR) # - in the install tree: # Get the relative path of the include directory so @@ -107,7 +107,7 @@ CONFIGURE_PACKAGE_CONFIG_FILE(misc/${PROJECT_NAME}Config.cmake.in ${PROJECT_BINARY_DIR}/to_install/${PROJECT_NAME}Config.cmake INSTALL_DESTINATION "${INSTALL_CMAKE_CONFIG_DIR}" PATH_VARS CONF_INCLUDE_DIRS INSTALL_CMAKE_CONFIG_DIR CMAKE_INSTALL_PREFIX LIBBATCH_PYTHONPATH - PYTHON_ROOT_DIR SWIG_ROOT_DIR) + PYTHON_ROOT_DIR SWIG_ROOT_DIR PTHREAD_ROOT_DIR) WRITE_BASIC_PACKAGE_VERSION_FILE(${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake VERSION ${${PROJECT_NAME_UC}_VERSION} diff --git a/misc/LibBatchConfig.cmake.in b/misc/LibBatchConfig.cmake.in index 17b833c..1ae61ca 100644 --- a/misc/LibBatchConfig.cmake.in +++ b/misc/LibBatchConfig.cmake.in @@ -61,6 +61,8 @@ SET_AND_CHECK(LIBBATCH_ROOT_DIR_EXP "@PACKAGE_CMAKE_INSTALL_PREFIX@") SET(LIBBATCH_LOCAL_SUBMISSION @LIBBATCH_LOCAL_SUBMISSION@) SET(LIBBATCH_PYTHON_WRAPPING @LIBBATCH_PYTHON_WRAPPING@) +SET_AND_CHECK(PTHREAD_ROOT_DIR_EXP "@PACKAGE_PTHREAD_ROOT_DIR@") + IF(LIBBATCH_PYTHON_WRAPPING) SET_AND_CHECK(LIBBATCH_PYTHONPATH "@PACKAGE_LIBBATCH_PYTHONPATH@") SET_AND_CHECK(PYTHON_ROOT_DIR_EXP "@PACKAGE_PYTHON_ROOT_DIR@") -- 2.39.2