Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion CodeCoverage.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
# - Added the option for users to set the GCOVR_ADDITIONAL_ARGS variable to supply additional
# flags to the gcovr command
#
# 2020-05-04, Mihchael Davis
# 2020-05-04, Michael Davis
Copy link
Author

Choose a reason for hiding this comment

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

This was @mdavis777 from a557fce

# - Add -fprofile-abs-path to make gcno files contain absolute paths
# - Fix BASE_DIRECTORY not working when defined
# - Change BYPRODUCT from folder to index.html to stop ninja from complaining about double defines
Expand Down
2 changes: 1 addition & 1 deletion FindMKL.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# See accompanying file LICENSE.txt or
# http://www.opengeosys.org/project/license

# Lookg for MKL root dir
# Look for MKL root dir
if (NOT MKL_DIR)
find_path(MKL_DIR
include/mkl.h
Expand Down
4 changes: 2 additions & 2 deletions FindOpenSG.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ MACRO(__OpenSG_ADJUST_LIB_VARS basename)

ENDIF(OpenSG_INCLUDE_DIR)

# Make variables changeble to the advanced user
# Make variables changeable to the advanced user
MARK_AS_ADVANCED(
OpenSG_${basename}_LIBRARY
OpenSG_${basename}_LIBRARY_RELEASE
Expand Down Expand Up @@ -236,7 +236,7 @@ ELSE(__OpenSG_IN_CACHE)
ENDIF(OPENSG_LIBRARY_SEARCH_DIR)

IF(NOT OpenSG_INCLUDE_DIR)
# try to find include dirrectory by searching for OSGConfigured.h
# try to find include directory by searching for OSGConfigured.h
FIND_PATH(OpenSG_INCLUDE_DIR
NAMES OpenSG/OSGConfigured.h
HINTS ${__OpenSG_INCLUDE_SEARCH_DIRS})
Expand Down
2 changes: 1 addition & 1 deletion FindOpenSGSupportlibs.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ if (NOT OpenSGSupportlibs_FOUND)
endif ()

# Set the include dir variables and the libraries and let libfind_process do the rest.
# NOTE: Singular variables for this library, plural for libraries this this lib depends on.
# NOTE: Singular variables for this library, plural for libraries this lib depends on.
set(OpenSGSupportlibs_PROCESS_INCLUDES OpenSGSupportlibs_INCLUDE_DIR)
set(OpenSGSupportlibs_PROCESS_LIBS OpenSGSupportlibs_LIBRARY)
libfind_process(OpenSGSupportlibs)
Expand Down
8 changes: 4 additions & 4 deletions cotire.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,12 @@ if (POLICY CMP0040)
endif()

if (POLICY CMP0045)
# error on non-existent target in get_target_property
# error on nonexistent target in get_target_property
cmake_policy(SET CMP0045 NEW)
endif()

if (POLICY CMP0046)
# error on non-existent dependency in add_dependencies
# error on nonexistent dependency in add_dependencies
cmake_policy(SET CMP0046 NEW)
endif()

Expand Down Expand Up @@ -2571,7 +2571,7 @@ function (cotire_setup_target_pch_usage _languages _target _wholeTarget)
message (STATUS "add_custom_command: TARGET ${_target} PRE_BUILD ${_cmds}")
endif()
# because CMake PRE_BUILD command does not support dependencies,
# we check dependencies explicity in cotire script mode when the pre-build action is run
# we check dependencies explicitly in cotire script mode when the pre-build action is run
add_custom_command(
TARGET "${_target}"
PRE_BUILD ${_cmds}
Expand Down Expand Up @@ -2625,7 +2625,7 @@ function (cotire_setup_unity_generation_commands _language _target _targetScript
endif()
if (WIN32 AND CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel")
# unity file compilation results in potentially huge object file,
# thus use /bigobj by default unter cl.exe and Windows Intel
# thus use /bigobj by default under cl.exe and Windows Intel
set_property (SOURCE "${_unityFile}" APPEND_STRING PROPERTY COMPILE_FLAGS "/bigobj")
endif()
cotire_set_cmd_to_prologue(_unityCmd)
Expand Down