Selaa lähdekoodia

Merge pull request #1572 from Azaezel/alpha41/cmakeCleanups

cmake cleanups
Brian Roberts 3 päivää sitten
vanhempi
commit
6c9263b625
2 muutettua tiedostoa jossa 2 lisäystä ja 0 poistoa
  1. 1 0
      CMakeLists.txt
  2. 1 0
      Engine/lib/CMakeLists.txt

+ 1 - 0
CMakeLists.txt

@@ -30,6 +30,7 @@ set(TORQUE_SOURCE_DIRECTROY "${CMAKE_SOURCE_DIR}/Engine/source")
 set(CMAKE_INSTALL_PREFIX "${TORQUE_APP_ROOT_DIRECTORY}" CACHE STRING "" FORCE)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${TORQUE_APP_GAME_DIRECTORY}")
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/Tools/CMake/finders")
+
 foreach( OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES} )
     string( TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIG )
     set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} "${TORQUE_APP_GAME_DIRECTORY}" )

+ 1 - 0
Engine/lib/CMakeLists.txt

@@ -3,6 +3,7 @@
 #ZLIB
 get_filename_component(ZLIB_ROOT "zlib" REALPATH BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
 set(ZLIB_ROOT "${ZLIB_ROOT}" CACHE STRING "ZLib root location" FORCE)
+advanced_option(ZLIB_BUILD_EXAMPLES "Enable Zlib Examples" OFF)
 mark_as_advanced(ZLIB_ROOT)
 # Png depends on zlib
 add_subdirectory(zlib ${TORQUE_LIB_TARG_DIRECTORY}/zlib EXCLUDE_FROM_ALL)