From 2bcdf41c92b5a0d41c4bd3a12a582cc982c689f4 Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 25 Sep 2010 10:10:24 +0200 Subject: [PATCH] Changed: Use of FindExternal module --- code/CMakeLists.txt | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index a252d6bfc..a1d72e742 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt @@ -41,22 +41,7 @@ INCLUDE(${CMAKE_ROOT}/Modules/Documentation.cmake OPTIONAL) CHECK_OUT_OF_SOURCE() IF(WIN32) - IF(NOT EXTERNAL_PATH) - SET(EXTERNAL_PATH "${CMAKE_CURRENT_SOURCE_DIR}/3rdParty" CACHE PATH "3rd party libraries root path.") - ENDIF(NOT EXTERNAL_PATH) - - IF(NOT EXTERNAL_INCLUDE_PATH) - SET(EXTERNAL_INCLUDE_PATH "${EXTERNAL_PATH}/include" CACHE PATH "3rd party libraries include path.") - ENDIF(NOT EXTERNAL_INCLUDE_PATH) - - IF(NOT EXTERNAL_LIBRARY_PATH) - SET(EXTERNAL_LIBRARY_PATH "${EXTERNAL_PATH}/lib" CACHE PATH "3rd party libraries lib path.") - ENDIF(NOT EXTERNAL_LIBRARY_PATH) - - SET(CMAKE_INCLUDE_PATH "${EXTERNAL_INCLUDE_PATH};${CMAKE_INCLUDE_PATH}") - # Stupid hack for FindOpenAL.cmake - SET(CMAKE_INCLUDE_PATH "${EXTERNAL_PATH};${CMAKE_INCLUDE_PATH}") - SET(CMAKE_LIBRARY_PATH "${EXTERNAL_LIBRARY_PATH};${CMAKE_LIBRARY_PATH}") + FIND_PACKAGE(External REQUIRED) IF(NOT DEFINED ENV{QTDIR}) SET(ENV{QTDIR} "c:/qt/4.5.0")