From 78b10b758bf94a60fdb5c61c5b5028c383840437 Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 4 Sep 2010 20:31:06 +0200 Subject: [PATCH] Changed: Don't create config.h under Windows --- code/nel/CMakeLists.txt | 10 ++++------ code/ryzom/CMakeLists.txt | 4 +++- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/nel/CMakeLists.txt b/code/nel/CMakeLists.txt index 8bc83bfb6..ed1d31ce8 100644 --- a/code/nel/CMakeLists.txt +++ b/code/nel/CMakeLists.txt @@ -1,11 +1,7 @@ PROJECT(NeL CXX C) IF(WITH_STATIC_DRIVERS) - IF(WIN32) - ADD_DEFINITIONS(/DNL_STATIC) - ELSE(WIN32) - ADD_DEFINITIONS(-DNL_STATIC) - ENDIF(WIN32) + ADD_DEFINITIONS(-DNL_STATIC) ENDIF(WITH_STATIC_DRIVERS) # On Windows we need to find DirectInput for NLMISC. @@ -98,7 +94,9 @@ IF(WIN32) SET(WINSOCK2_LIB ws2_32.lib) ENDIF(WIN32) -NL_CONFIGURE_CHECKS() +IF(NOT WIN32) + NL_CONFIGURE_CHECKS() +ENDIF(NOT WIN32) ADD_SUBDIRECTORY(include) ADD_SUBDIRECTORY(src) diff --git a/code/ryzom/CMakeLists.txt b/code/ryzom/CMakeLists.txt index 56e9e40ca..999e81ccc 100644 --- a/code/ryzom/CMakeLists.txt +++ b/code/ryzom/CMakeLists.txt @@ -18,7 +18,9 @@ ENDIF(NOT WIN32 AND NOT APPLE) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/common/src ) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/common ) -NL_CONFIGURE_CHECKS() +IF(NOT WIN32) + NL_CONFIGURE_CHECKS() +ENDIF(NOT WIN32) IF(WITH_STATIC) SET(CURL_LIBRARIES ${CURL_LIBRARIES} ${OPENSSL_LIBRARIES})