Skip to content

Update CMakeLists.txt #34

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

Open
AlexejStukov wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update CMakeLists.txt #34

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e47a25
Update CMakeLists.txt
smorokin Oct 30, 2015
f6c7371
Update CMakeLists.txt
smorokin Nov 30, 2015
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
12 changes: 8 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,10 @@ if(NOT CMAKE_INSTALL_PREFIX)
endif(NOT CMAKE_INSTALL_PREFIX)

# Check if it is a 64 bit system
if(CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT LIB_SUFFIX)
set(LIB_SUFFIX "64")
endif()
#
#if(CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT LIB_SUFFIX)
# set(LIB_SUFFIX "64")
#endif()

# Install the dynamic library to /usr/lib[64]
install(TARGETS redox DESTINATION lib${LIB_SUFFIX})
Expand All @@ -188,7 +189,10 @@ install(FILES ${INC_REDOX_WRAPPER} DESTINATION include)
# ---------------------------------------------------------

# Determine build architecture
execute_process(COMMAND uname -m COMMAND tr -d '\n' OUTPUT_VARIABLE ARCHITECTURE)
execute_process(COMMAND dpkg-architecture -q "DEB_BUILD_ARCH" COMMAND tr -d '\n' OUTPUT_VARIABLE ARCHITECTURE ERROR_QUIET)
if(NOT ARCHITECTURE)
execute_process(COMMAND uname -m COMMAND tr -d '\n' OUTPUT_VARIABLE ARCHITECTURE)
endif()
message("Building for ${ARCHITECTURE}")

# build CPack driven installer packages
Expand Down