f1x1t/myx-cmake
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: f1x1t:489fd9fc143546bb4a6a4caaa97b882c6a558f60
Branches Tags
f1x1t:master
f1x1t:0.6.0
..
compare: f1x1t:dd2a4fdb7dc2e762f53fc985beee30fe80fcf6c6
Branches Tags
f1x1t:master
f1x1t:0.6.0

No commits in common. "489fd9fc143546bb4a6a4caaa97b882c6a558f60" and "dd2a4fdb7dc2e762f53fc985beee30fe80fcf6c6" have entirely different histories.
489fd9fc14 ... dd2a4fdb7d

3 changed files with 17 additions and 13 deletions
Show Stats Expand all files Collapse all files

16
MyxCMake/modules/MyxCMakeGenerateGitInfoHeader.cmake
View File

@ -2,7 +2,7 @@ include_guard(GLOBAL)
function(myx_cmake_generate_git_info_header)
set(_filename ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/${MYX_CMAKE_PROJECT_NAME_LOWER}/myx_cmake_git_info_p.hpp)
set(_filename ${CMAKE_BINARY_DIR}/${CMAKE_INCLUDE_DIR}/${MYX_CMAKE_PROJECT_NAME_LOWER}/myx_cmake_git_info_p.hpp)
if(MYX_CMAKE_GENERATED_HEADERS_PATH)
set(_filename ${MYX_CMAKE_GENERATED_HEADERS_PATH}/${MYX_CMAKE_PROJECT_NAME_LOWER}/myx_cmake_git_info_p.hpp)
elseif(ARGV0)
@ -56,20 +56,20 @@ if(GIT_EXECUTABLE)
# Check whether we got any revision (which isn't always the case,
# e.g. when someone downloaded a zip file from Github instead of a checkout)
if(NOT \"\${MYX_CMAKE_GIT_REV}\" STREQUAL \"\")
if(NOT ${MYX_CMAKE_GIT_REV} STREQUAL \"\")
execute_process(COMMAND bash -c \"git diff --quiet --exit-code || echo +\" OUTPUT_VARIABLE MYX_CMAKE_GIT_DIFF)
execute_process(COMMAND git describe --exact-match --tags OUTPUT_VARIABLE MYX_CMAKE_GIT_TAG ERROR_QUIET)
execute_process(COMMAND git rev-parse --abbrev-ref HEAD OUTPUT_VARIABLE MYX_CMAKE_GIT_BRANCH)
string(STRIP \"\${MYX_CMAKE_GIT_REV}\" MYX_CMAKE_GIT_REV)
string(SUBSTRING \"\${MYX_CMAKE_GIT_REV}\" 1 7 MYX_CMAKE_GIT_REV)
string(STRIP \"\${MYX_CMAKE_GIT_DIFF}\" MYX_CMAKE_GIT_DIFF)
string(STRIP \"\${MYX_CMAKE_GIT_TAG}\" MYX_CMAKE_GIT_TAG)
string(STRIP \"\${MYX_CMAKE_GIT_BRANCH}\" MYX_CMAKE_GIT_BRANCH)
string(STRIP \"${MYX_CMAKE_GIT_REV}\" MYX_CMAKE_GIT_REV)
string(SUBSTRING \"${MYX_CMAKE_GIT_REV}\" 1 7 MYX_CMAKE_GIT_REV)
string(STRIP \"${MYX_CMAKE_GIT_DIFF}\" MYX_CMAKE_GIT_DIFF)
string(STRIP \"${MYX_CMAKE_GIT_TAG}\" MYX_CMAKE_GIT_TAG)
string(STRIP \"${MYX_CMAKE_GIT_BRANCH}\" MYX_CMAKE_GIT_BRANCH)
endif()
endif()
configure_file(${_git_info_hpp_in_path} \"\${MYX_CMAKE_GIT_INFO_FILE}\")
configure_file(${_git_info_hpp_in_path} ${MYX_CMAKE_GIT_INFO_FILE})
")
set(_git_info_cmake_in_path ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/MyxCMakeGitInfo.cmake.in)
file(WRITE ${_git_info_cmake_in_path} ${_git_info_cmake_in})

2
MyxCMake/modules/MyxCMakeGeneratePrivateConfigHeader.cmake
View File

@ -5,7 +5,7 @@ function(myx_cmake_generate_private_config_header)
include(MyxCMakeLargeFiles)
myx_cmake_test_large_files(HAVE_LARGEFILES)
set(_filename ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/${MYX_CMAKE_PROJECT_NAME_LOWER}/myx_cmake_private_config_p.hpp)
set(_filename ${CMAKE_BINARY_DIR}/${CMAKE_INCLUDE_DIR}/${MYX_CMAKE_PROJECT_NAME_LOWER}/myx_cmake_private_config_p.hpp)
if(MYX_CMAKE_GENERATED_HEADERS_PATH)
set(_filename ${MYX_CMAKE_GENERATED_HEADERS_PATH}/${MYX_CMAKE_PROJECT_NAME_LOWER}/myx_cmake_private_config_p.hpp)
elseif(ARGV0)

12
MyxCMake/modules/MyxCMakeRequiredVariables.cmake
View File

@ -5,22 +5,26 @@ include_guard(GLOBAL)
# cmake-format: off
if(NOT MYX_CMAKE_ORGANIZATION_NAME)
myx_cmake_message_warning("MyxCMake: Variable MYX_CMAKE_ORGANIZATION_NAME is undefined")
myx_cmake_message_warning("MyxCMake: Required variable MYX_CMAKE_ORGANIZATION_NAME is not defined")
else()
set(MYX_CMAKE_ORGANIZATION_NAME "ORG NAME" CACHE STRING "")
endif()
if(NOT MYX_CMAKE_AUTHOR_NAME)
myx_cmake_message_warning("MyxCMake: Variable MYX_CMAKE_AUTHOR_NAME is undefined")
myx_cmake_message_warning("MyxCMake: Required variable MYX_CMAKE_AUTHOR_NAME is not defined")
else()
set(MYX_CMAKE_AUTHOR_NAME "AUTHOR NAME" CACHE STRING "")
endif()
if(NOT MYX_CMAKE_AUTHOR_EMAIL)
myx_cmake_message_warning("MyxCMake: Variable MYX_CMAKE_AUTHOR_EMAIL is undefined")
myx_cmake_message_warning("MyxCMake: Required variable MYX_CMAKE_AUTHOR_EMAIL is not defined")
else()
set(MYX_CMAKE_AUTHOR_EMAIL "AUTHOR@EMAIL" CACHE STRING "")
endif()
if(NOT MYX_CMAKE_DESCRIPTION)
myx_cmake_message_warning("MyxCMake: Variable MYX_CMAKE_DESCRIPTION is undefined")
myx_cmake_message_warning("MyxCMake: Required variable MYX_CMAKE_DESCRIPTION is not defined")
else()
set(MYX_CMAKE_DESCRIPTION "PROJECT DESCRIPTION" CACHE STRING "")
endif()