Skip to content

CI: Refactor so path containing regex character does not cause issues #676

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

Merged
merged 5 commits into from
Jun 27, 2025
Merged

CI: Refactor so path containing regex character does not cause issues #676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0e211f4
CI: Refactor so path containing regex character does not cause issues
gsjaardema Jun 25, 2025
ad1a044
CI: Fix tribits exclude_files
gsjaardema Jun 25, 2025
c47e79b
CI: Can use exclude_files again
gsjaardema Jun 25, 2025
dbb3955
CI: Clean out commented code; fix indentation
gsjaardema Jun 25, 2025
d63e57e
CI: Add some comments to new code
gsjaardema Jun 27, 2025
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
5 changes: 3 additions & 2 deletions cmake/tribits/core/package_arch/TribitsPackagingSupport.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,9 @@ macro(tribits_exclude_files)
#Ensure that if the full path was specified for the file that we don't add
#"/<project source dir>/<package dir>/" again.
set(MATCH_STRING "${${PACKAGE_NAME}_SOURCE_DIR}")
string(REGEX MATCH ${MATCH_STRING} MATCHED ${FILE} )
if(NOT MATCHED)
string(FIND ${FILE} ${MATCH_STRING} POSITION)
# string(REGEX MATCH ${MATCH_STRING} MATCHED ${FILE} )
if(NOT POSITION EQUAL 0)
list(APPEND MODIFIED_FILES_TO_EXCLUDE
"${${PACKAGE_NAME}_SOURCE_DIR}/${FILE}")
else()
Expand Down
33 changes: 21 additions & 12 deletions packages/seacas/scripts/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,27 +109,36 @@ IF (${PROJECT_NAME}_ENABLE_SEACASExodus)

IF (BUILD_SHARED_LIBS OR SEACASExodus_ENABLE_SHARED)
IF (NOT "${CMAKE_INSTALL_PREFIX}" STREQUAL "")
IF( ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR} MATCHES "^${CMAKE_INSTALL_PREFIX}.*" )
STRING( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" ""
SEACAS_INCLUDEDIR "${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}" )
STRING( REGEX REPLACE "^/" "" SEACAS_INCLUDEDIR "${SEACAS_INCLUDEDIR}" )
ELSEIF( NOT ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR} MATCHES "^/" )
string(FIND ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR} ${CMAKE_INSTALL_PREFIX} POSITION)
cmake_path(IS_ABSOLUTE ${PROJECT_NAME}_INSTALL_INCLUDE_DIR IS_PATH_ABSOLUTE)

IF (${POSITION} EQUAL 0)
# The include install path is a under the install path.
file(RELATIVE_PATH SEACAS_INCLUDEDIR ${CMAKE_INSTALL_PREFIX} ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR} )
ELSEIF(IS_PATH_ABSOLUTE)
# The include install path is different than the install path
SET( SEACAS_INCLUDEDIR "${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}" )
ELSE()
# If neither, just set to include.
SET( SEACAS_INCLUDEDIR "include" )
ENDIF()
IF( ${${PROJECT_NAME}_INSTALL_LIB_DIR} MATCHES "^${CMAKE_INSTALL_PREFIX}.*" )
STRING( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" ""
SEACAS_LIBDIR "${${PROJECT_NAME}_INSTALL_LIB_DIR}" )
STRING( REGEX REPLACE "^/" "" SEACAS_LIBDIR "${SEACAS_LIBDIR}")
ELSEIF( NOT ${CMAKE_INSTALL_LIBDIR} MATCHES "^/" )

string(FIND ${${PROJECT_NAME}_INSTALL_LIB_DIR} ${CMAKE_INSTALL_PREFIX} POSITION)
cmake_path(IS_ABSOLUTE ${PROJECT_NAME}_INSTALL_LIB_DIR IS_PATH_ABSOLUTE)
IF (${POSITION} EQUAL 0)
# The libary path is a under the install path.
file(RELATIVE_PATH SEACAS_LIBDIR ${CMAKE_INSTALL_PREFIX} ${${PROJECT_NAME}_INSTALL_LIB_DIR} )
ELSEIF(IS_PATH_ABSOLUTE)
# The libarary install path is different than the install path
SET( SEACAS_LIBDIR "${${PROJECT_NAME}_INSTALL_LIB_DIR}" )
ELSE()
SET( SEACAS_LIBDIR "lib" )
ENDIF()
ENDIF()
FILE(GLOB_RECURSE EXODUSIIH "${CMAKE_SOURCE_DIR}/packages/seacas/*exodusII.h")
FILE(STRINGS "${EXODUSIIH}" EXODUS_VERSION REGEX "#define EXODUS_VERSION .*")

FILE(GLOB_RECURSE EXODUSIIH "${CMAKE_SOURCE_DIR}/packages/seacas/*exodusII.h")
FILE(STRINGS "${EXODUSIIH}" EXODUS_VERSION REGEX "#define EXODUS_VERSION .*")

CONFIGURE_FILE(
${CMAKE_CURRENT_SOURCE_DIR}/exodus2.in.py
${CMAKE_CURRENT_BINARY_DIR}/exodus2.py
Expand Down