Skip to content

cmake: don't use PREFIX variable #50564

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
ZhilkinSerg merged 1 commit into from
Aug 7, 2021
Merged

cmake: don't use PREFIX variable #50564

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 3 additions & 7 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ set(CATA_CLANG_TIDY_INCLUDE_DIR "" CACHE STRING
"Path to internal clang-tidy headers required for plugin (e.g. ClangTidy.h)")
set(CATA_CHECK_CLANG_TIDY "" CACHE STRING "Path to check_clang_tidy.py for plugin tests")
set(GIT_BINARY "" CACHE STRING "Git binary name or path.")
set(PREFIX "" CACHE STRING "Location of Data & GFX directories")

include(CTest)

Expand Down Expand Up @@ -153,10 +152,6 @@ else ()
endif ()
endif ()

if (PREFIX)
add_definitions(-DPREFIX=${PREFIX})
endif ()

# Can't compile curses and tiles build's at same time
if (TILES)
set(CURSES OFF)
Expand Down Expand Up @@ -185,8 +180,9 @@ else ()
message(STATUS "PIXMAPS_UNITY_ENTRY_PATH : ${PIXMAPS_UNITY_ENTRY_PATH}")
message(STATUS "MANPAGE_ENTRY_PATH : ${MANPAGE_ENTRY_PATH}")
add_definitions(-DRELEASE)
# Use PREFIX as storage of data,gfx, etc.. Useful only on *nix OS.
if (PREFIX AND NOT WIN32)
# Use CMAKE_INSTALL_PREFIX as storage of data,gfx, etc.. Useful only on *nix OS.
if (CMAKE_INSTALL_PREFIX AND NOT WIN32)
add_definitions(-DPREFIX=${CMAKE_INSTALL_PREFIX})
add_definitions(-DDATA_DIR_PREFIX)
endif ()
endif ()
Expand Down