AnotherFoxGuy/autocmake
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

thorough workaround for CMAKE_CURRENT_LIST_DIR variable

Browse Source 
- to fix this for CMake 2.8.2
This commit is contained in:
Miro ILIAS
2015-11-10 09:22:26 +01:00
parent f639bea034
commit 950652aedd
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/boost/boost.cmake
View File

@@ -71,6 +71,10 @@
# Underscore-separated version number # Underscore-separated version number
string(REGEX REPLACE "\\." "_" BOOSTVER ${BOOST_MINIMUM_REQUIRED}) string(REGEX REPLACE "\\." "_" BOOSTVER ${BOOST_MINIMUM_REQUIRED})
# Where the Boost .zip archive is located # Where the Boost .zip archive is located
# CMAKE_CURRENT_LIST_DIR is undefined in CMake 2.8.2
# see https://public.kitware.com/Bug/print_bug_page.php?bug_id=11675
# workaround: create CMAKE_CURRENT_LIST_DIR
get_filename_component(CMAKE_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_FILE} PATH)
set(BOOST_ARCHIVE_LOCATION ${CMAKE_CURRENT_LIST_DIR}) set(BOOST_ARCHIVE_LOCATION ${CMAKE_CURRENT_LIST_DIR})
set(BOOST_ARCHIVE boost_${BOOSTVER}.zip) set(BOOST_ARCHIVE boost_${BOOSTVER}.zip)
@@ -119,6 +123,11 @@ if(BUILD_CUSTOM_BOOST)
endif() endif()
endif() endif()
string(TOLOWER ${CMAKE_BUILD_TYPE} type) string(TOLOWER ${CMAKE_BUILD_TYPE} type)
# CMAKE_CURRENT_LIST_DIR is undefined in CMake 2.8.2
# see https://public.kitware.com/Bug/print_bug_page.php?bug_id=11675
# workaround: create CMAKE_CURRENT_LIST_DIR
get_filename_component(CMAKE_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_FILE} PATH)
include(${CMAKE_CURRENT_LIST_DIR}/boost_unpack.cmake) include(${CMAKE_CURRENT_LIST_DIR}/boost_unpack.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/boost_userconfig.cmake) include(${CMAKE_CURRENT_LIST_DIR}/boost_userconfig.cmake)

5
modules/git_info/git_info.cmake
View File

@@ -12,11 +12,8 @@
# CMAKE_CURRENT_LIST_DIR is undefined in CMake 2.8.2 # CMAKE_CURRENT_LIST_DIR is undefined in CMake 2.8.2
# see https://public.kitware.com/Bug/print_bug_page.php?bug_id=11675 # see https://public.kitware.com/Bug/print_bug_page.php?bug_id=11675
# workaround: create CMAKE_CURRENT_LIST_DIR if it doesn't exist # workaround: create CMAKE_CURRENT_LIST_DIR
if(NOT DEFINED CMAKE_CURRENT_LIST_DIR)
get_filename_component(CMAKE_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_FILE} PATH) get_filename_component(CMAKE_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_FILE} PATH)
endif()
add_custom_command( add_custom_command(
OUTPUT ${PROJECT_BINARY_DIR}/git_info.h OUTPUT ${PROJECT_BINARY_DIR}/git_info.h
COMMAND ${CMAKE_COMMAND} -D_target_dir=${PROJECT_BINARY_DIR} -P git_info_sub.cmake COMMAND ${CMAKE_COMMAND} -D_target_dir=${PROJECT_BINARY_DIR} -P git_info_sub.cmake

4
modules/git_info/git_info_sub.cmake
View File

@@ -45,6 +45,10 @@ if(GIT_FOUND)
string(STRIP ${_git_branch} _git_branch) string(STRIP ${_git_branch} _git_branch)
endif() endif()
# CMAKE_CURRENT_LIST_DIR is undefined in CMake 2.8.2
# see https://public.kitware.com/Bug/print_bug_page.php?bug_id=11675
# workaround: create CMAKE_CURRENT_LIST_DIR
get_filename_component(CMAKE_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_FILE} PATH)
configure_file( configure_file(
${CMAKE_CURRENT_LIST_DIR}/git_info.h.in ${CMAKE_CURRENT_LIST_DIR}/git_info.h.in
${_target_dir}/git_info.h ${_target_dir}/git_info.h