Skip to content

Commit

Permalink
Modified build scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
ajanicijamd committed Oct 28, 2024
1 parent 768dbd3 commit 1d86b84
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
1 change: 0 additions & 1 deletion .github/workflows/opensuse.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ jobs:
-DROCPROFSYS_CI_MPI_RUN_AS_ROOT=ON
-DROCPROFSYS_MAX_THREADS=64
-DROCPROFSYS_DISABLE_EXAMPLES="transpose;rccl"
-DCMAKE_DEFAULT_INSTALL_LIBDIR="lib64"
-DROCPROFSYS_BUILD_NUMBER=${{ github.run_attempt }}

- name: Install
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/redhat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ jobs:
-DROCPROFSYS_PYTHON_PREFIX=/opt/conda/envs
-DROCPROFSYS_PYTHON_ENVS="py3.6;py3.7;py3.8;py3.9;py3.10;py3.11"
-DROCPROFSYS_DISABLE_EXAMPLES="transpose;rccl"
-DCMAKE_DEFAULT_INSTALL_LIBDIR="lib64"
-DROCPROFSYS_BUILD_NUMBER=${{ github.run_attempt }}
--
-LE "transpose|rccl"
Expand Down
11 changes: 7 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -98,14 +98,20 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
set(_STRIP_LIBRARIES_DEFAULT ON)
endif()

if(DEFINED CMAKE_DEFAULT_INSTALL_LIBDIR AND NOT DEFINED CMAKE_INSTALL_LIBDIR)
if (NOT DEFINED CMAKE_INSTALL_LIBDIR)
if(DEFINED CMAKE_DEFAULT_INSTALL_LIBDIR)
# always have a fresh install
unset(CMAKE_INSTALL_LIBDIR CACHE)
include(GNUInstallDirs) # install directories
# force this because dyninst always installs to lib
set(CMAKE_INSTALL_LIBDIR
"${CMAKE_DEFAULT_INSTALL_LIBDIR}"
CACHE STRING "Object code libraries" FORCE)
else()
set(CMAKE_INSTALL_LIBDIR
"lib"
CACHE STRING "Object code libraries" FORCE)
endif()
endif()

if(NOT "$ENV{ROCPROFSYS_CI}" STREQUAL "")
Expand Down Expand Up @@ -150,9 +156,6 @@ endif()
include(Compilers) # compiler identification
include(BuildSettings) # compiler flags

set(CMAKE_INSTALL_LIBDIR
"lib"
CACHE STRING "Object code libraries (lib)" FORCE)
set(CMAKE_CXX_STANDARD
17
CACHE STRING "CXX language standard")
Expand Down

0 comments on commit 1d86b84

Please sign in to comment.