Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed cmake warnings and set appropriate policy #1536

Merged
merged 2 commits into from Sep 10, 2015
Merged

Fixed cmake warnings and set appropriate policy #1536

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e65ac53
Fixed cmake warnings and set appropriate policy
aashish24 Sep 10, 2015
f677f5f
Added guard for specific policy to ensure support for older cmake ver…
aashish24 Sep 10, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMake/cdat_modules/freetype_external.cmake
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@ ExternalProject_Add(freetype
#ln -sf @EXTERNALS@/include/freetype2/freetype @EXTERNALS@/include/freetype

ExternalProject_Add_Step(freetype symlink
COMMAND ${CMAKE_COMMAND} -E create_symlink @cdat_EXTERNALS@/include/freetype2/freetype @cdat_EXTERNALS@/include/freetype
COMMAND ${CMAKE_COMMAND} -E create_symlink ${cdat_EXTERNALS}/include/freetype2/freetype ${cdat_EXTERNALS}/include/freetype
COMMENT "Symlink include/freetype2/freetype include directory as include/freetype"
DEPENDEES install
)
2 changes: 1 addition & 1 deletion CMake/cdat_modules/pip_external.cmake
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@ set(nm pip)
# create an external project to install MyProxyClient,
# and configure and build it

include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
include(${cdat_CMAKE_BINARY_DIR}/cdat_common_environment.cmake)
string(TOUPPER ${nm} uc_nm)

ExternalProject_Add(${nm}
Expand Down
6 changes: 6 additions & 0 deletions CMake/cmake_modules/ExternalProject.cmake
View file
Open in desktop
Expand Up @@ -156,6 +156,10 @@
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)

# CMake policy usages
cmake_policy(PUSH)
cmake_policy(SET CMP0054 NEW)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This policy was introduced in 3.1. Probably should add if(POLICY CMP0054) to support older cmake's.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure @jbeezley. This is a good point. I pushed a change.


# Pre-compute a regex to match documented keywords for each command.
math(EXPR _ep_documentation_line_count "${CMAKE_CURRENT_LIST_LINE} - 16")
file(STRINGS "${CMAKE_CURRENT_LIST_FILE}" lines
Expand Down Expand Up @@ -1598,3 +1602,5 @@ function(ExternalProject_Add name)
#
_ep_add_test_command(${name})
endfunction(ExternalProject_Add)

cmake_policy(POP)