Fixed paths for cmake

8 files changed, 17 insertions, 17 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1d0966116d..577ed3ea16 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,7 +26,7 @@ set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH 1)
 
 # 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(CheckIncludeFiles)
@@ -80,10 +80,10 @@ if(NOT WITHOUT_GIT)
 endif()
 
 # 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
-include(src/cmake/showoptions.cmake)
+include(modules/acore/cmake/showoptions.cmake)
 
 # add modules and dependencies
 CU_SUBDIRLIST(sub_DIRS  "${CMAKE_SOURCE_DIR}/modules" FALSE FALSE)
diff --git a/modules/acore/cmake/macros/CheckPlatform.cmake b/modules/acore/cmake/macros/CheckPlatform.cmake
index 5ef5f6d9a5..f5d3fa9585 100644
--- a/modules/acore/cmake/macros/CheckPlatform.cmake
+++ b/modules/acore/cmake/macros/CheckPlatform.cmake
@@ -7,12 +7,12 @@ else()
     MESSAGE(STATUS "Detected 32-bit platform")
 endif()
 
-include("${CMAKE_SOURCE_DIR}/src/cmake/platform/settings.cmake")
+include("${CMAKE_SOURCE_DIR}/modules/acore/cmake/platform/settings.cmake")
 
 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)
-  include("${CMAKE_SOURCE_DIR}/src/cmake/platform/unix/settings.cmake")
+  include("${CMAKE_SOURCE_DIR}/modules/acore/cmake/platform/unix/settings.cmake")
 endif()
 
-include("${CMAKE_SOURCE_DIR}/src/cmake/platform/after_platform.cmake")
+include("${CMAKE_SOURCE_DIR}/modules/acore/cmake/platform/after_platform.cmake")
diff --git a/modules/acore/cmake/macros/FindGit.cmake b/modules/acore/cmake/macros/FindGit.cmake
index a37370c849..2672dd4b0e 100644
--- a/modules/acore/cmake/macros/FindGit.cmake
+++ b/modules/acore/cmake/macros/FindGit.cmake
@@ -7,7 +7,7 @@
 # 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
 # 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")
 
diff --git a/modules/acore/cmake/platform/unix/settings.cmake b/modules/acore/cmake/platform/unix/settings.cmake
index daa2653434..b60c1db43f 100644
--- a/modules/acore/cmake/platform/unix/settings.cmake
+++ b/modules/acore/cmake/platform/unix/settings.cmake
@@ -20,7 +20,7 @@ endif()
 
 # configure uninstaller
 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"
   @ONLY
 )
@@ -34,11 +34,11 @@ message(STATUS "UNIX: Created uninstall target")
 
 message(STATUS "UNIX: Detected compiler: ${CMAKE_C_COMPILER}")
 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")
-  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")
-  include(${CMAKE_SOURCE_DIR}/src/cmake/compiler/clang/settings.cmake)
+  include(${CMAKE_SOURCE_DIR}/modules/acore/cmake/compiler/clang/settings.cmake)
 else()
 add_definitions(-D_BUILD_DIRECTIVE='"${CMAKE_BUILD_TYPE}"')
 endif()
diff --git a/modules/acore/cmake/platform/win/settings.cmake b/modules/acore/cmake/platform/win/settings.cmake
index b55fa5eb7b..ce10d6716d 100644
--- a/modules/acore/cmake/platform/win/settings.cmake
+++ b/modules/acore/cmake/platform/win/settings.cmake
@@ -26,7 +26,7 @@ endif()
 #endif()
 
 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 )
-  include(${CMAKE_SOURCE_DIR}/src/cmake/compiler/mingw/settings.cmake)
+  include(${CMAKE_SOURCE_DIR}/modules/acore/cmake/compiler/mingw/settings.cmake)
 endif()
diff --git a/modules/acore/deps/mysqllite/configure.cmake b/modules/acore/deps/mysqllite/configure.cmake
index 36de1101b4..49e2fbb07a 100644
--- a/modules/acore/deps/mysqllite/configure.cmake
+++ b/modules/acore/deps/mysqllite/configure.cmake
@@ -719,7 +719,7 @@ IF(NOT STACK_DIRECTION)
   ELSE()
     TRY_RUN(STACKDIR_RUN_RESULT STACKDIR_COMPILE_RESULT
      ${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).
      # Convert to -1 or 1
diff --git a/modules/acore/deps/mysqllite/include/mysql.h b/modules/acore/deps/mysqllite/include/mysql.h
index dd507063c4..0755846bc8 100644
--- a/modules/acore/deps/mysqllite/include/mysql.h
+++ b/modules/acore/deps/mysqllite/include/mysql.h
@@ -20,7 +20,7 @@
   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
   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
diff --git a/modules/acore/genrev/CMakeLists.txt b/modules/acore/genrev/CMakeLists.txt
index 64b2abdf74..f7b5a4eba9 100644
--- a/modules/acore/genrev/CMakeLists.txt
+++ b/modules/acore/genrev/CMakeLists.txt
@@ -10,6 +10,6 @@
 
 # Need to pass old ${CMAKE_BINARY_DIR} as param because its different at build stage
 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}
 )