From f0d758bc6af1a078cebafc4f5484aaf40907c29f Mon Sep 17 00:00:00 2001 From: kervala Date: Thu, 2 Sep 2010 18:23:02 +0200 Subject: [PATCH] Changed: Moved config.h stuff in ConfigureChecks.cmake --- code/ryzom/CMakeLists.txt | 5 ----- code/ryzom/CMakeModules/ConfigureChecks.cmake | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/code/ryzom/CMakeLists.txt b/code/ryzom/CMakeLists.txt index aa4430116..aa4368a71 100644 --- a/code/ryzom/CMakeLists.txt +++ b/code/ryzom/CMakeLists.txt @@ -113,11 +113,6 @@ IF(FINAL_VERSION) ADD_DEFINITIONS(-DFINAL_VERSION=1) ENDIF(FINAL_VERSION) -# config.h configuration and use by projects -CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_BINARY_DIR}/config.h) -INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}) -ADD_DEFINITIONS(-DHAVE_CONFIG_H) - ADD_SUBDIRECTORY(common) IF(WITH_CLIENT) diff --git a/code/ryzom/CMakeModules/ConfigureChecks.cmake b/code/ryzom/CMakeModules/ConfigureChecks.cmake index 982cca4b1..4a0c76e1d 100644 --- a/code/ryzom/CMakeModules/ConfigureChecks.cmake +++ b/code/ryzom/CMakeModules/ConfigureChecks.cmake @@ -44,5 +44,6 @@ MACRO(NL_CONFIGURE_CHECKS) CHECK_FUNCTION_EXISTS("stat64" HAVE_STAT64) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) ADD_DEFINITIONS(-DHAVE_CONFIG_H) ENDMACRO(NL_CONFIGURE_CHECKS)