yolinlin/azerothcore-wotlk-pbot
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2025-11-29 17:38:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed paths for cmake

Browse Source
This commit is contained in:
Yehonal
2016-08-12 00:52:12 +02:00
parent b0c8eceb08
commit dec72dddca
8 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@@ -26,7 +26,7 @@ set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH 1) set(CMAKE_INSTALL_RPATH_USE_LINK_PATH 1)
# set macro-directory # set macro-directory
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/src/cmake/macros") set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/modules/acore/cmake/macros")
include(CheckCXXSourceRuns) include(CheckCXXSourceRuns)
include(CheckIncludeFiles) include(CheckIncludeFiles)
@@ -80,10 +80,10 @@ if(NOT WITHOUT_GIT)
endif() endif()
# Find revision ID and hash of the sourcetree # Find revision ID and hash of the sourcetree
include(src/cmake/genrev.cmake) include(modules/acore/cmake/genrev.cmake)
# print out the results before continuing # print out the results before continuing
include(src/cmake/showoptions.cmake) include(modules/acore/cmake/showoptions.cmake)
# add modules and dependencies # add modules and dependencies
CU_SUBDIRLIST(sub_DIRS "${CMAKE_SOURCE_DIR}/modules" FALSE FALSE) CU_SUBDIRLIST(sub_DIRS "${CMAKE_SOURCE_DIR}/modules" FALSE FALSE)

8
modules/acore/cmake/macros/CheckPlatform.cmake
View File

@@ -7,12 +7,12 @@ else()
MESSAGE(STATUS "Detected 32-bit platform") MESSAGE(STATUS "Detected 32-bit platform")
endif() endif()
include("${CMAKE_SOURCE_DIR}/src/cmake/platform/settings.cmake") include("${CMAKE_SOURCE_DIR}/modules/acore/cmake/platform/settings.cmake")
if(WIN32) if(WIN32)
include("${CMAKE_SOURCE_DIR}/src/cmake/platform/win/settings.cmake") include("${CMAKE_SOURCE_DIR}/modules/acore/cmake/platform/win/settings.cmake")
elseif(UNIX) elseif(UNIX)
include("${CMAKE_SOURCE_DIR}/src/cmake/platform/unix/settings.cmake") include("${CMAKE_SOURCE_DIR}/modules/acore/cmake/platform/unix/settings.cmake")
endif() endif()
include("${CMAKE_SOURCE_DIR}/src/cmake/platform/after_platform.cmake") include("${CMAKE_SOURCE_DIR}/modules/acore/cmake/platform/after_platform.cmake")

2
modules/acore/cmake/macros/FindGit.cmake
View File

@@ -7,7 +7,7 @@
# This program is distributed in the hope that it will be useful, but # This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
include(${CMAKE_SOURCE_DIR}/src/cmake/macros/EnsureVersion.cmake) include(${CMAKE_SOURCE_DIR}/modules/acore/cmake/macros/EnsureVersion.cmake)
set(_REQUIRED_GIT_VERSION "1.7") set(_REQUIRED_GIT_VERSION "1.7")

8
modules/acore/cmake/platform/unix/settings.cmake
View File

@@ -20,7 +20,7 @@ endif()
# configure uninstaller # configure uninstaller
configure_file( configure_file(
"${CMAKE_SOURCE_DIR}/src/cmake/platform/cmake_uninstall.in.cmake" "${CMAKE_SOURCE_DIR}/modules/acore/cmake/platform/cmake_uninstall.in.cmake"
"${CMAKE_BINARY_DIR}/cmake_uninstall.cmake" "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake"
@ONLY @ONLY
) )
@@ -34,11 +34,11 @@ message(STATUS "UNIX: Created uninstall target")
message(STATUS "UNIX: Detected compiler: ${CMAKE_C_COMPILER}") message(STATUS "UNIX: Detected compiler: ${CMAKE_C_COMPILER}")
if(CMAKE_C_COMPILER MATCHES "gcc" OR CMAKE_C_COMPILER_ID STREQUAL "GNU") if(CMAKE_C_COMPILER MATCHES "gcc" OR CMAKE_C_COMPILER_ID STREQUAL "GNU")
include(${CMAKE_SOURCE_DIR}/src/cmake/compiler/gcc/settings.cmake) include(${CMAKE_SOURCE_DIR}/modules/acore/cmake/compiler/gcc/settings.cmake)
elseif(CMAKE_C_COMPILER MATCHES "icc") elseif(CMAKE_C_COMPILER MATCHES "icc")
include(${CMAKE_SOURCE_DIR}/src/cmake/compiler/icc/settings.cmake) include(${CMAKE_SOURCE_DIR}/modules/acore/cmake/compiler/icc/settings.cmake)
elseif(CMAKE_C_COMPILER MATCHES "clang") elseif(CMAKE_C_COMPILER MATCHES "clang")
include(${CMAKE_SOURCE_DIR}/src/cmake/compiler/clang/settings.cmake) include(${CMAKE_SOURCE_DIR}/modules/acore/cmake/compiler/clang/settings.cmake)
else() else()
add_definitions(-D_BUILD_DIRECTIVE='"${CMAKE_BUILD_TYPE}"') add_definitions(-D_BUILD_DIRECTIVE='"${CMAKE_BUILD_TYPE}"')
endif() endif()

4
modules/acore/cmake/platform/win/settings.cmake
View File

@@ -26,7 +26,7 @@ endif()
#endif() #endif()
if ( MSVC ) if ( MSVC )
include(${CMAKE_SOURCE_DIR}/src/cmake/compiler/msvc/settings.cmake) include(${CMAKE_SOURCE_DIR}/modules/acore/cmake/compiler/msvc/settings.cmake)
elseif ( MINGW ) elseif ( MINGW )
include(${CMAKE_SOURCE_DIR}/src/cmake/compiler/mingw/settings.cmake) include(${CMAKE_SOURCE_DIR}/modules/acore/cmake/compiler/mingw/settings.cmake)
endif() endif()

2
modules/acore/deps/mysqllite/configure.cmake
View File

@@ -719,7 +719,7 @@ IF(NOT STACK_DIRECTION)
ELSE() ELSE()
TRY_RUN(STACKDIR_RUN_RESULT STACKDIR_COMPILE_RESULT TRY_RUN(STACKDIR_RUN_RESULT STACKDIR_COMPILE_RESULT
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/src/cmake/stack_direction.c ${CMAKE_SOURCE_DIR}/cmake/stack_direction.c
) )
# Test program returns 0 (down) or 1 (up). # Test program returns 0 (down) or 1 (up).
# Convert to -1 or 1 # Convert to -1 or 1

2
modules/acore/deps/mysqllite/include/mysql.h
View File

@@ -20,7 +20,7 @@
The ABI should never be changed in a released product of MySQL, The ABI should never be changed in a released product of MySQL,
thus you need to take great care when changing the file. In case thus you need to take great care when changing the file. In case
the file is changed so the ABI is broken, you must also update the file is changed so the ABI is broken, you must also update
the SHARED_LIB_MAJOR_VERSION in src/cmake/mysql_version.cmake the SHARED_LIB_MAJOR_VERSION in cmake/mysql_version.cmake
*/ */
#ifndef _mysql_h #ifndef _mysql_h

2
modules/acore/genrev/CMakeLists.txt
View File

@@ -10,6 +10,6 @@
# Need to pass old ${CMAKE_BINARY_DIR} as param because its different at build stage # Need to pass old ${CMAKE_BINARY_DIR} as param because its different at build stage
add_custom_target(revision.h ALL add_custom_target(revision.h ALL
COMMAND ${CMAKE_COMMAND} -DBUILDDIR=${CMAKE_BINARY_DIR} -P ${CMAKE_SOURCE_DIR}/src/cmake/genrev.cmake COMMAND ${CMAKE_COMMAND} -DBUILDDIR=${CMAKE_BINARY_DIR} -P ${CMAKE_SOURCE_DIR}/modules/acore/cmake/genrev.cmake
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
) )