From 953c055ced8d666c16fe3fe766f83b950fdeff31 Mon Sep 17 00:00:00 2001 From: Karl Goetz Date: Wed, 17 Dec 2014 21:06:56 +1100 Subject: [PATCH] Remove duplicate DCUSTOM_DATA_INSTALL_PATH Within 5 lines CUSTOM_DATA_INSTALL_PATH is defined twice resulting in lots of compiler warnings; eg [ 11%] Building CXX object source/shared_lib/sources/streflop/CMakeFiles/streflop.dir/libm/flt-32/s_atanf.cpp.o In file included from :175: :7:9: warning: 'CUSTOM_DATA_INSTALL_PATH' macro redefined ^ :2:9: note: previous definition is here ^ This removes the second definition. Conflicts: CMakeLists.txt --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 052c586a..562d4118 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -280,7 +280,6 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW) SET (CUSTOM_DATA_INSTALL_PATH "\"${CMAKE_INSTALL_PREFIX}/${MEGAGLEST_DATA_INSTALL_PATH}\"" CACHE STRING "The FULL installation path for data files (this is build automatically by combining CMAKE_INSTALL_PREFIX and MEGAGLEST_DATA_INSTALL_PATH)") ENDIF() SET(CUSTOM_DATA_INSTALL_PATH_VALUE "-DCUSTOM_DATA_INSTALL_PATH=${CUSTOM_DATA_INSTALL_PATH}") - ADD_DEFINITIONS("-DCUSTOM_DATA_INSTALL_PATH=${CUSTOM_DATA_INSTALL_PATH}") SET(PKG_DATADIR ${CUSTOM_DATA_INSTALL_PATH_VALUE}) SET(PKG_BINDIR ${MEGAGLEST_BIN_INSTALL_PATH})