Split CMakeModules into Modules and Toolchains

xycaleth · Jun 10, 2020 · 6976d52 · 6976d52
1 parent 9606ce4
commit 6976d52
Show file tree

Hide file tree

Showing 11 changed files with 4 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -94,7 +94,7 @@ if(APPLE)
 endif()
 
 # Custom CMake Modules needed
-list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_SOURCE_DIR}/CMakeModules")
+list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_SOURCE_DIR}/cmake/Modules")
 
 Include(CheckTypeSize)
 check_type_size("void*" CMAKE_SIZEOF_VOID_P)

diff --git a/Dockerfile b/Dockerfile
@@ -13,7 +13,7 @@ COPY . /usr/src/openjk
 # Build i386 arch
 RUN mkdir /usr/src/openjk/build.i386 &&\
 	cd /usr/src/openjk/build.i386 &&\
-	cmake -DCMAKE_TOOLCHAIN_FILE=CMakeModules/Toolchains/linux-i686.cmake \
+	cmake -DCMAKE_TOOLCHAIN_FILE=cmake/toolchains/linux-i686.cmake \
 		-DCMAKE_INSTALL_PREFIX=/opt \
 		-DBuildMPCGame=OFF -DBuildMPEngine=OFF -DBuildMPRdVanilla=OFF -DBuildMPUI=OFF \
 		-DBuildSPEngine=OFF -DBuildSPGame=OFF -DBuildSPRdVanilla=OFF \

diff --git a/CMakeModules/GetGitRevisionDescription.cmake → ...e/Modules/GetGitRevisionDescription.cmake b/CMakeModules/GetGitRevisionDescription.cmake → ...e/Modules/GetGitRevisionDescription.cmake
diff --git a/...odules/GetGitRevisionDescription.cmake.in → ...odules/GetGitRevisionDescription.cmake.in b/...odules/GetGitRevisionDescription.cmake.in → ...odules/GetGitRevisionDescription.cmake.in
diff --git a/CMakeModules/InstallConfig.cmake → cmake/Modules/InstallConfig.cmake b/CMakeModules/InstallConfig.cmake → cmake/Modules/InstallConfig.cmake
diff --git a/CMakeModules/InstallZIP.cmake → cmake/Modules/InstallZIP.cmake b/CMakeModules/InstallZIP.cmake → cmake/Modules/InstallZIP.cmake
diff --git a/CMakeModules/LICENSE_1_0.txt → cmake/Modules/LICENSE_1_0.txt b/CMakeModules/LICENSE_1_0.txt → cmake/Modules/LICENSE_1_0.txt
diff --git a/...Modules/Toolchains/i686-w64-mingw32.cmake → cmake/Toolchains/i686-w64-mingw32.cmake b/...Modules/Toolchains/i686-w64-mingw32.cmake → cmake/Toolchains/i686-w64-mingw32.cmake
diff --git a/CMakeModules/Toolchains/linux-i686.cmake → cmake/Toolchains/linux-i686.cmake b/CMakeModules/Toolchains/linux-i686.cmake → cmake/Toolchains/linux-i686.cmake
diff --git a/...dules/Toolchains/x86_64-w64-mingw32.cmake → cmake/Toolchains/x86_64-w64-mingw32.cmake b/...dules/Toolchains/x86_64-w64-mingw32.cmake → cmake/Toolchains/x86_64-w64-mingw32.cmake
diff --git a/scripts/travis/build.sh b/scripts/travis/build.sh
@@ -14,13 +14,13 @@ case "${host}" in
 		export CC=${host}-gcc
 		export CXX=${host}-g++
 		set -- \
-			-D CMAKE_TOOLCHAIN_FILE=$(pwd)/CMakeModules/Toolchains/${host}.cmake \
+			-D CMAKE_TOOLCHAIN_FILE=$(pwd)/cmake/toolchains/${host}.cmake \
 			"$@"
 		;;
 
 	(i?86-linux-gnu)
 		set -- \
-			-D CMAKE_TOOLCHAIN_FILE=$(pwd)/CMakeModules/Toolchains/linux-i686.cmake \
+			-D CMAKE_TOOLCHAIN_FILE=$(pwd)/cmake/toolchains/linux-i686.cmake \
 			"$@"
 		;;