Move code related to configuring Zlib and QuaZip to seperate .cmake f…

…iles.
przemek83 · Dec 11, 2024 · a0f29ad · a0f29ad
1 parent 619d51d
commit a0f29ad
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -23,18 +23,8 @@ qt_standard_project_setup()
 include(GNUInstallDirs)
 include(CMakePackageConfigHelpers)
 
-configure_file(CMakeLists.txt.zlib zlib/CMakeLists.txt)
-execute_process(COMMAND ${CMAKE_COMMAND} -G ${CMAKE_GENERATOR} .
-        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/zlib)
-execute_process(COMMAND ${CMAKE_COMMAND} --build .
-        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/zlib )
-
-set(ZLIB_ROOT ${CMAKE_CURRENT_BINARY_DIR}/zlib/install)
-find_package(ZLIB REQUIRED)
-include_directories( ${CMAKE_CURRENT_BINARY_DIR}/zlib/install/include)
-
-include(CMakeLists.txt.quazip)
-include_directories(${CMAKE_CURRENT_BINARY_DIR}/_deps/quazip-src)
+include(ZlibConfig.cmake)
+include(QuaZipConfig.cmake)
 
 set(${PROJECT_NAME}_SOURCES 
     src/EibleUtilities.h

diff --git a/CMakeLists.txt.quazip → QuaZipConfig.cmake b/CMakeLists.txt.quazip → QuaZipConfig.cmake
@@ -7,3 +7,5 @@ FetchContent_Declare(
 )
 
 FetchContent_MakeAvailable(QuaZip)
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR}/_deps/quazip-src)
diff --git a/ZlibConfig.cmake b/ZlibConfig.cmake
@@ -0,0 +1,9 @@
+configure_file(CMakeLists.txt.zlib zlib/CMakeLists.txt)
+execute_process(COMMAND ${CMAKE_COMMAND} -G ${CMAKE_GENERATOR} .
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/zlib)
+execute_process(COMMAND ${CMAKE_COMMAND} --build .
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/zlib )
+
+set(ZLIB_ROOT ${CMAKE_CURRENT_BINARY_DIR}/zlib/install)
+find_package(ZLIB REQUIRED)
+include_directories( ${CMAKE_CURRENT_BINARY_DIR}/zlib/install/include)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,3 +7,5 @@ FetchContent_Declare(
		)

		FetchContent_MakeAvailable(QuaZip)

		include_directories(${CMAKE_CURRENT_BINARY_DIR}/_deps/quazip-src)