[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [marble] /: create dedicated cmake folders for modules and templates
From:       Bernhard Beschow <bbeschow () cs ! tu-berlin ! de>
Date:       2012-05-31 19:54:20
Message-ID: 20120531195420.41CD9A60A9 () git ! kde ! org
[Download RAW message or body]

Git commit 3ccf81be9eea7a3203af74cec2ba99cd398759c9 by Bernhard Beschow.
Committed on 31/05/2012 at 21:32.
Pushed by beschow into branch 'master'.

create dedicated cmake folders for modules and templates

M  +3    -3    CMakeLists.txt
R  +0    -0    cmake/modules/FindMarble.cmake [from: FindMarble.cmake - 100=
% similarity]
R  +0    -0    cmake/modules/FindPhonon.cmake [from: FindPhonon.cmake - 100=
% similarity]
R  +0    -0    cmake/modules/FindQtLocation.cmake [from: FindQtLocation.cma=
ke - 100% similarity]
R  +0    -0    cmake/modules/FindQtMobility.cmake [from: FindQtMobility.cma=
ke - 100% similarity]
R  +0    -0    cmake/modules/Findlibgps.cmake [from: Findlibgps.cmake - 100=
% similarity]
R  +0    -0    cmake/modules/Findliblocation.cmake [from: Findliblocation.c=
make - 100% similarity]
R  +0    -0    cmake/modules/Findlibshp.cmake [from: Findlibshp.cmake - 100=
% similarity]
R  +0    -0    cmake/templates/cmake_uninstall.cmake.in [from: cmake_templa=
tes/cmake_uninstall.cmake.in - 100% similarity]
R  +0    -0    cmake/templates/marblesvnversion.h.in_cmake [from: cmake_tem=
plates/marblesvnversion.h.in_cmake - 100% similarity]
R  +1    -1    cmake/templates/svnscript.cmake.in_cmake [from: cmake_templa=
tes/svnscript.cmake.in_cmake - 088% similarity]

http://commits.kde.org/marble/3ccf81be9eea7a3203af74cec2ba99cd398759c9

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 40dbe62..388826c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -218,7 +218,7 @@ add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FA=
ST_OPERATOR_PLUS)
 # Where to look first for cmake modules, =

 # before ${CMAKE_ROOT}/Modules/ is checked
 set ( CMAKE_MODULE_PATH =

-     ${CMAKE_SOURCE_DIR}/cmake/Modules =

+     ${CMAKE_SOURCE_DIR}/cmake/modules
      ${CMAKE_CURRENT_SOURCE_DIR}
      ${CMAKE_CURRENT_SOURCE_DIR}/src
      ${CMAKE_CURRENT_SOURCE_DIR}/cmake_find_rules
@@ -276,7 +276,7 @@ ENDIF (NOT EXISTS SVN_MARKER)
 # Add a custom command to drive the svn script whenever the svn entries
 # file changes.
 CONFIGURE_FILE(
-       "${CMAKE_CURRENT_SOURCE_DIR}/cmake_templates/svnscript.cmake.in_cma=
ke"
+       "${CMAKE_CURRENT_SOURCE_DIR}/cmake/templates/svnscript.cmake.in_cma=
ke"
        "${CMAKE_CURRENT_BINARY_DIR}/svnscript.cmake"
        @ONLY)
 =

@@ -373,7 +373,7 @@ endif( CMAKE_MODULES_INSTALL_PATH )
 if(QTONLY)
     # only add the uninstall target for qt-only builds
     CONFIGURE_FILE(
-        "${CMAKE_CURRENT_SOURCE_DIR}/cmake_templates/cmake_uninstall.cmake=
.in"
+        "${CMAKE_CURRENT_SOURCE_DIR}/cmake/templates/cmake_uninstall.cmake=
.in"
         "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
         IMMEDIATE @ONLY)
 =

diff --git a/FindMarble.cmake b/cmake/modules/FindMarble.cmake
similarity index 100%
rename from FindMarble.cmake
rename to cmake/modules/FindMarble.cmake
diff --git a/FindPhonon.cmake b/cmake/modules/FindPhonon.cmake
similarity index 100%
rename from FindPhonon.cmake
rename to cmake/modules/FindPhonon.cmake
diff --git a/FindQtLocation.cmake b/cmake/modules/FindQtLocation.cmake
similarity index 100%
rename from FindQtLocation.cmake
rename to cmake/modules/FindQtLocation.cmake
diff --git a/FindQtMobility.cmake b/cmake/modules/FindQtMobility.cmake
similarity index 100%
rename from FindQtMobility.cmake
rename to cmake/modules/FindQtMobility.cmake
diff --git a/Findlibgps.cmake b/cmake/modules/Findlibgps.cmake
similarity index 100%
rename from Findlibgps.cmake
rename to cmake/modules/Findlibgps.cmake
diff --git a/Findliblocation.cmake b/cmake/modules/Findliblocation.cmake
similarity index 100%
rename from Findliblocation.cmake
rename to cmake/modules/Findliblocation.cmake
diff --git a/Findlibshp.cmake b/cmake/modules/Findlibshp.cmake
similarity index 100%
rename from Findlibshp.cmake
rename to cmake/modules/Findlibshp.cmake
diff --git a/cmake_templates/cmake_uninstall.cmake.in b/cmake/templates/cma=
ke_uninstall.cmake.in
similarity index 100%
rename from cmake_templates/cmake_uninstall.cmake.in
rename to cmake/templates/cmake_uninstall.cmake.in
diff --git a/cmake_templates/marblesvnversion.h.in_cmake b/cmake/templates/=
marblesvnversion.h.in_cmake
similarity index 100%
rename from cmake_templates/marblesvnversion.h.in_cmake
rename to cmake/templates/marblesvnversion.h.in_cmake
diff --git a/cmake_templates/svnscript.cmake.in_cmake b/cmake/templates/svn=
script.cmake.in_cmake
similarity index 88%
rename from cmake_templates/svnscript.cmake.in_cmake
rename to cmake/templates/svnscript.cmake.in_cmake
index 392723f..286bd85 100644
--- a/cmake_templates/svnscript.cmake.in_cmake
+++ b/cmake/templates/svnscript.cmake.in_cmake
@@ -13,5 +13,5 @@ ELSE (SVNVERSION)
 ENDIF (SVNVERSION)
 =

 # Configure the marblesvnversion.h
-CONFIGURE_FILE("@CMAKE_CURRENT_SOURCE_DIR@/cmake_templates/marblesvnversio=
n.h.in_cmake"
+CONFIGURE_FILE("@CMAKE_CURRENT_SOURCE_DIR@/cmake/templates/marblesvnversio=
n.h.in_cmake"
                "@CMAKE_CURRENT_BINARY_DIR@/marblesvnversion.h")
[prev in list] [next in list] [prev in thread] [next in thread]