Skip to content

Commit

Permalink
typo elseif() should be else()
Browse files Browse the repository at this point in the history
  • Loading branch information
yhmtsai committed Sep 23, 2019
1 parent 21bb344 commit 00767a0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion cmake/build_helpers.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ function(ginkgo_compile_features name)
set_property(TARGET "${name}" PROPERTY CXX_INCLUDE_WHAT_YOU_USE ${GINKGO_IWYU_PATH})
endif()
if(GINKGO_CHANGED_SHARED_LIBRARY)
# Put all shared libraries and corresponding imported libraries into the specficed path
# Put all shared libraries and corresponding imported libraries into the specficed path
set_property(TARGET "${name}" PROPERTY
RUNTIME_OUTPUT_DIRECTORY "${GINKGO_WINDOWS_SHARED_LIBRARY_PATH}")
set_property(TARGET "${name}" PROPERTY
Expand Down
6 changes: 3 additions & 3 deletions cmake/package_helpers.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ function(ginkgo_load_git_package package_name package_url package_tag)
message(FATAL_ERROR
"Build Release step for ${package_name}/download failed: ${result}")
endif()
elseif()
else()
execute_process(COMMAND ${CMAKE_COMMAND} --build .
RESULT_VARIABLE result
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/download)
Expand Down Expand Up @@ -98,7 +98,7 @@ macro(ginkgo_add_external_target new_target external_name includedir libdir buil
# Ginkgo only builds Debug and Release, so set the path without CMAKE_CFG_INTDIR.
set(${external_name}_LIBRARY_RELEASE "${${external_name}_BINARY_DIR}/Release/${CMAKE_${build_type}_LIBRARY_PREFIX}${external_name}${CMAKE_${build_type}_LIBRARY_SUFFIX}")
set(${external_name}_LIBRARY_DEBUG "${${external_name}_BINARY_DIR}/Debug/${CMAKE_${build_type}_LIBRARY_PREFIX}${external_name}${debug_postfix}${CMAKE_${build_type}_LIBRARY_SUFFIX}")
elseif()
else()
set(${external_name}_LIBRARY_RELEASE "${${external_name}_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${CMAKE_${build_type}_LIBRARY_PREFIX}${external_name}${CMAKE_${build_type}_LIBRARY_SUFFIX}")
set(${external_name}_LIBRARY_DEBUG "${${external_name}_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${CMAKE_${build_type}_LIBRARY_PREFIX}${external_name}${debug_postfix}${CMAKE_${build_type}_LIBRARY_SUFFIX}")
endif()
Expand All @@ -124,7 +124,7 @@ macro(ginkgo_add_external_target new_target external_name includedir libdir buil
${${external_name}_LIBRARY_DEBUG})
set_target_properties(${new_target} PROPERTIES IMPORTED_LOCATION
${${external_name}_LIBRARY_RELEASE})
elseif()
else()
if (NOT CMAKE_BUILD_TYPE MATCHES "[Rr][Ee][Ll][Ee][Aa][Ss][Ee]"
AND NOT CMAKE_BUILD_TYPE MATCHES "[Dd][Ee][Bb][Uu][Gg]")
set_target_properties(${new_target} PROPERTIES IMPORTED_LOCATION
Expand Down

0 comments on commit 00767a0

Please sign in to comment.