Skip to content

Commit

Permalink
Fixing some typos in the lib warning and error messages (TriBITS #28)
Browse files Browse the repository at this point in the history
  • Loading branch information
Roscoe A. Bartlett committed Oct 5, 2014
1 parent a955807 commit e475583
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
18 changes: 9 additions & 9 deletions package_arch/TribitsAddExecutable.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -397,11 +397,11 @@ FUNCTION(TRIBITS_ADD_EXECUTABLE EXE_NAME)
ELSEIF (TARGET ${PREFIXED_LIB})
MESSAGE(FATAL_ERROR "ERROR: Lib '${IMPORTEDLIB}' being passed through"
" IMPORTEDLIBS is *not* an external library but instead is a library"
" define in this CMake project!"
" defined in this CMake project!"
" TriBITS takes care of linking against libraries in dependent upstream"
" SE packages. If you want to link to a library in an upstream SE"
" package then add the the SE package name to the approciate argument in"
" in this SE package's dependencies file"
" package then add the SE package name for that library to the appropriate"
" list in this SE package's dependencies file"
" ${${PACKAGE_NAME}_SOURCE_DIR}/cmake/Dependencies.cmake")
ENDIF()
ENDFOREACH()
Expand All @@ -416,13 +416,13 @@ FUNCTION(TRIBITS_ADD_EXECUTABLE EXE_NAME)
LIST(APPEND PARSE_TESTONLYLIBS ${DEPLIB})
ELSEIF (TARGET ${PREFIXED_LIB})
MESSAGE(WARNING "WARNING: Passing non-TESTONLY lib '${DEPLIB}' through DEPLIBS"
" is deprecated. The library '${DEPLIB}' appears to be a"
" library defined in this CMake project!"
" is deprecated! The library '${DEPLIB}' appears to be a"
" library defined in this CMake project."
" TriBITS takes care of linking against libraries in dependent upstream"
" SE packages. Therefore, please remove '${DEPLIB}' from this list."
" If you want to link to a library in an upstream SE"
" package then add the SE package name to the appropriate category"
" in this SE package's depencencies file: "
" If you want to link to a library from an upstream SE"
" package, then add the SE package name to the appropriate category"
" in this SE package's dependencies file: "
" ${${PACKAGE_NAME}_SOURCE_DIR}/cmake/Dependencies.cmake")
ELSE()
MESSAGE(WARNING "WARNING: Passing external lib '${DEPLIB}' through"
Expand All @@ -449,7 +449,7 @@ FUNCTION(TRIBITS_ADD_EXECUTABLE EXE_NAME)
ENDIF()

IF(${PROJECT_NAME}_VERBOSE_CONFIGURE)
MESSAGE("TRIBITS_ADD_EXECUTABLE: ADD_EXECTUABLE(${EXE_BINARY_NAME} ${EXE_SOURCES})")
MESSAGE("TRIBITS_ADD_EXECUTABLE: ADD_EXECUTABLE(${EXE_BINARY_NAME} ${EXE_SOURCES})")
ENDIF()
ADD_EXECUTABLE(${EXE_BINARY_NAME} ${EXE_SOURCES})
APPEND_GLOBAL_SET(${PARENT_PACKAGE_NAME}_ALL_TARGETS ${EXE_BINARY_NAME})
Expand Down
2 changes: 1 addition & 1 deletion package_arch/TribitsLibraryMacros.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@ FUNCTION(TRIBITS_ADD_LIBRARY LIBRARY_NAME_IN)
" ${${PACKAGE_NAME}_SOURCE_DIR}/cmake/Dependencies.cmake")
ELSEIF (NOT LIB_IN_SE_PKG AND NOT TARGET ${PREFIXED_LIB} )
MESSAGE(WARNING "WARNING: '${LIB}' in DEPSLIBS is not"
" a lib defined in the current cmake project! Such usage is deprecated (and"
" a lib defined in the current cmake project! Such usage is deprecated (and"
" will result in a configure error soon). If this is an external"
" lib you are trying to link in, it should likely be handled as a TriBITS"
" TPL. Otherwise, it should be passed in through IMPORTEDLIBS. However,"
Expand Down

0 comments on commit e475583

Please sign in to comment.