|
@@ -390,22 +390,27 @@ else()
|
|
|
set(BIN_DIR "." CACHE STRING "Where to install binaries")
|
|
set(BIN_DIR "." CACHE STRING "Where to install binaries")
|
|
|
set(LIB_DIR "." CACHE STRING "Where to install main library")
|
|
set(LIB_DIR "." CACHE STRING "Where to install main library")
|
|
|
set(DATA_DIR "." CACHE STRING "Where to install data files")
|
|
set(DATA_DIR "." CACHE STRING "Where to install data files")
|
|
|
|
|
+
|
|
|
|
|
+ # following constants only used for platforms using XDG (Linux, BSD, etc)
|
|
|
|
|
+ add_definitions(-DM_DATA_DIR="${DATA_DIR}")
|
|
|
|
|
+ add_definitions(-DM_BIN_DIR="${BIN_DIR}")
|
|
|
|
|
+ add_definitions(-DM_LIB_DIR="${LIB_DIR}")
|
|
|
else()
|
|
else()
|
|
|
if(NOT BIN_DIR)
|
|
if(NOT BIN_DIR)
|
|
|
- set(BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE STRING "Where to install binaries")
|
|
|
|
|
|
|
+ set(BIN_DIR "bin" CACHE STRING "Where to install binaries")
|
|
|
endif()
|
|
endif()
|
|
|
if(NOT LIB_DIR)
|
|
if(NOT LIB_DIR)
|
|
|
- set(LIB_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/vcmi" CACHE STRING "Where to install main library")
|
|
|
|
|
|
|
+ set(LIB_DIR "${CMAKE_INSTALL_LIBDIR}/vcmi" CACHE STRING "Where to install main library")
|
|
|
endif()
|
|
endif()
|
|
|
if(NOT DATA_DIR)
|
|
if(NOT DATA_DIR)
|
|
|
- set(DATA_DIR "${CMAKE_INSTALL_PREFIX}/share/vcmi" CACHE STRING "Where to install data files")
|
|
|
|
|
|
|
+ set(DATA_DIR "share/vcmi" CACHE STRING "Where to install data files")
|
|
|
endif()
|
|
endif()
|
|
|
- endif()
|
|
|
|
|
|
|
|
|
|
- # following constants only used for platforms using XDG (Linux, BSD, etc)
|
|
|
|
|
- add_definitions(-DM_DATA_DIR="${DATA_DIR}")
|
|
|
|
|
- add_definitions(-DM_BIN_DIR="${BIN_DIR}")
|
|
|
|
|
- add_definitions(-DM_LIB_DIR="${LIB_DIR}")
|
|
|
|
|
|
|
+ # following constants only used for platforms using XDG (Linux, BSD, etc)
|
|
|
|
|
+ add_definitions(-DM_DATA_DIR="${CMAKE_INSTALL_PREFIX}/${DATA_DIR}")
|
|
|
|
|
+ add_definitions(-DM_BIN_DIR="${CMAKE_INSTALL_PREFIX}/${BIN_DIR}")
|
|
|
|
|
+ add_definitions(-DM_LIB_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}")
|
|
|
|
|
+ endif()
|
|
|
endif()
|
|
endif()
|
|
|
|
|
|
|
|
# iOS has flat libs directory structure
|
|
# iOS has flat libs directory structure
|