From 536e31d77189d48b121e1f5b7ad5eb011df0ce40 Mon Sep 17 00:00:00 2001 From: j883376 Date: Fri, 21 Jun 2013 23:21:57 -0400 Subject: [PATCH] Change binary output path to use CMake variable Tools that use CMake's EXECUTABLE_OUTPUT_PATH variable to determine which binary to launch for debugging may be confused by a relative path, so use CMake variable PROJECT_BINARY_DIR instead. --- common/CMakeLists.txt | 2 +- eqlaunch/CMakeLists.txt | 2 +- loginserver/CMakeLists.txt | 2 +- queryserv/CMakeLists.txt | 2 +- shared_memory/CMakeLists.txt | 2 +- ucs/CMakeLists.txt | 2 +- world/CMakeLists.txt | 2 +- zone/CMakeLists.txt | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index 1f613a885..286b678db 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -318,4 +318,4 @@ IF(UNIX) SET_SOURCE_FILES_PROPERTIES("patches/SoD.cpp" "patches/SoF.cpp" "patches/RoF.cpp" "patches/Underfoot.cpp" PROPERTIES COMPILE_FLAGS -O0) ENDIF(UNIX) -SET(LIBRARY_OUTPUT_PATH ../Bin) +SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/Bin) diff --git a/eqlaunch/CMakeLists.txt b/eqlaunch/CMakeLists.txt index ef1c366ad..5c9ad6a60 100644 --- a/eqlaunch/CMakeLists.txt +++ b/eqlaunch/CMakeLists.txt @@ -37,4 +37,4 @@ IF(UNIX) ADD_DEFINITIONS(-fPIC) ENDIF(UNIX) -SET(EXECUTABLE_OUTPUT_PATH ../Bin) +SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/Bin) diff --git a/loginserver/CMakeLists.txt b/loginserver/CMakeLists.txt index 7f2b25647..7a4272a70 100644 --- a/loginserver/CMakeLists.txt +++ b/loginserver/CMakeLists.txt @@ -67,4 +67,4 @@ IF(UNIX) ADD_DEFINITIONS(-fPIC) ENDIF(UNIX) -SET(EXECUTABLE_OUTPUT_PATH ../Bin) +SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/Bin) diff --git a/queryserv/CMakeLists.txt b/queryserv/CMakeLists.txt index d63a7f814..8b8196b12 100644 --- a/queryserv/CMakeLists.txt +++ b/queryserv/CMakeLists.txt @@ -43,4 +43,4 @@ IF(UNIX) ADD_DEFINITIONS(-fPIC) ENDIF(UNIX) -SET(EXECUTABLE_OUTPUT_PATH ../Bin) +SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/Bin) diff --git a/shared_memory/CMakeLists.txt b/shared_memory/CMakeLists.txt index 01f79ec06..76c8b75bd 100644 --- a/shared_memory/CMakeLists.txt +++ b/shared_memory/CMakeLists.txt @@ -43,4 +43,4 @@ IF(UNIX) ADD_DEFINITIONS(-fPIC) ENDIF(UNIX) -SET(EXECUTABLE_OUTPUT_PATH ../Bin) +SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/Bin) diff --git a/ucs/CMakeLists.txt b/ucs/CMakeLists.txt index 23ce4b781..6603470f6 100644 --- a/ucs/CMakeLists.txt +++ b/ucs/CMakeLists.txt @@ -46,4 +46,4 @@ IF(UNIX) ADD_DEFINITIONS(-fPIC) ENDIF(UNIX) -SET(EXECUTABLE_OUTPUT_PATH ../Bin) +SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/Bin) diff --git a/world/CMakeLists.txt b/world/CMakeLists.txt index ee2fe0a22..a14505485 100644 --- a/world/CMakeLists.txt +++ b/world/CMakeLists.txt @@ -92,4 +92,4 @@ IF(UNIX) ADD_DEFINITIONS(-fPIC) ENDIF(UNIX) -SET(EXECUTABLE_OUTPUT_PATH ../Bin) +SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/Bin) diff --git a/zone/CMakeLists.txt b/zone/CMakeLists.txt index ccba19144..9ff776c14 100644 --- a/zone/CMakeLists.txt +++ b/zone/CMakeLists.txt @@ -182,4 +182,4 @@ ENDIF(UNIX) INCLUDE_DIRECTORIES(${VLD_INCLUDE_DIR}) -SET(EXECUTABLE_OUTPUT_PATH ../Bin) +SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/Bin)