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

Update standard #1009

Merged
merged 9 commits into from
Oct 17, 2016
Merged

Update standard #1009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
580a849
No length comparisons for header install
jdonald Oct 4, 2016
1c425ef
Default to Release build if CMAKE_BUILD_TYPE unspecified
jdonald Oct 4, 2016
60eb443
Use full path to the OS X SDK
jdonald Oct 12, 2016
901a102
Merge pull request #25 from leapmotion/fix-osx-sdk
yeswalrus Oct 12, 2016
4b8c772
Merge pull request #24 from leapmotion/feature-default-release
yeswalrus Oct 12, 2016
283295e
Remove duplicate code, clarify logic around extracting the install di…
Oct 12, 2016
be037bb
Restore comment spacing style
jdonald Oct 12, 2016
cf4ccda
Merge pull request #23 from leapmotion/fix-installheaders
Oct 12, 2016
383ceac
Merge branch 'master' of github.com:leapmotion/standard
jdonald Oct 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 18 additions & 30 deletions standard/InstallHeaders.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,43 +33,31 @@ function(install_headers)
continue()
endif()

# Need to make the path absolute. We first look in the source directory,
# then we look in the binary directory, but only if the path is relative.
if(NOT IS_ABSOLUTE ${src})
get_filename_component(src_src ${src} ABSOLUTE BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
get_filename_component(src_bin ${src} ABSOLUTE BASE_DIR ${CMAKE_CURRENT_BINARY_DIR})
if(EXISTS ${src_src})
set(src ${src_src})
elseif(EXISTS ${src_bin})
set(src ${src_bin})
else()
message(FATAL_ERROR "Could not find input header file ${src}")
endif()
endif()

# We find out what directory part the file is in, we want the shortest
# relative path on the assumption that the file will be most properly
# located in the directory whose relative address is the shortest.
file(RELATIVE_PATH src_rel ${CMAKE_CURRENT_SOURCE_DIR} ${src})
get_filename_component(src_rel ${src_rel} DIRECTORY)
if(src_rel)
string(LENGTH ${src_rel} src_rel_len)
set(actual_rel ${src_rel})
# When the path to the file is absolute, we don't know what we should be installing
# it relative to. Warn
if(IS_ABSOLUTE ${src})
message(WARNING "Not sure where to install file with absolute path ${src}")
continue()
endif()

file(RELATIVE_PATH bin_rel ${CMAKE_CURRENT_BINARY_DIR} ${src})
get_filename_component(bin_rel ${bin_rel} DIRECTORY)
if(bin_rel)
string(LENGTH ${bin_rel} bin_rel_len)
if(src_rel AND bin_rel_len LESS src_rel_len)
set(actual_rel ${bin_rel})
# Determine which path the file is relative to and use intermediate directories as the install path
foreach(_search_dir "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}")
get_filename_component(src_abs ${src} ABSOLUTE BASE_DIR ${_search_dir})
if(EXISTS ${src_abs})
set(src ${src_abs})
file(RELATIVE_PATH containing_dir ${_search_dir} ${src})
get_filename_component(containing_dir ${containing_dir} DIRECTORY)
break()
endif()
endforeach()

if(NOT EXISTS ${src_abs})
message(FATAL_ERROR "Could not find input header file ${src}")
endif()

get_filename_component(src_ext ${src} EXT)
install(
FILES ${src}
DESTINATION ${opt_DESTINATION}/${actual_rel}
DESTINATION ${opt_DESTINATION}/${containing_dir}
${opt_UNPARSED_ARGUMENTS}
)
endforeach()
Expand Down
6 changes: 5 additions & 1 deletion standard/StandardProject.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ function(standard_project_preinit)
endif()
endif()

if(NOT MSVC AND NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build, options are: Debug Release." FORCE)
endif()

# These do not strictly *have* to be set prior to project, but they can be so we will
# Need to classify the architecture before we run anything else, this lets us easily
# configure the find version file based on what the architecture was actually built to
Expand Down Expand Up @@ -114,7 +118,7 @@ function(standard_project_preinit)
set(_developer_sdk_version 10.12)
endif()
if(_developer_sdk_version)
set(CMAKE_OSX_SYSROOT "macosx${_developer_sdk_version}" CACHE STRING "Mac OS X build environment" FORCE)
set(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${_developer_sdk_version}.sdk" CACHE STRING "Mac OS X build environment" FORCE)
if(NOT CMAKE_OSX_DEPLOYMENT_TARGET)
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "Mac OS X deployment target" FORCE)
endif()
Expand Down