From 5354650d1c5ced4ec7121493130298e4e16655ff Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Thu, 5 Jul 2012 16:56:04 +0200 Subject: [PATCH] Kill duplicated code in CMakeLists.txt. --- CMakeLists.txt | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1be51f1356..22b8e37d02 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -92,26 +92,16 @@ endif(CMAKE_CACHE_MAJOR_VERSION EQUAL "2" AND CMAKE_CACHE_MINOR_VERSION GREATER ### Set some variables for Cmake SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib) -if("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_HOME_DIRECTORY}") - set(INCLUDES - ${CMAKE_HOME_DIRECTORY} - ${CMAKE_HOME_DIRECTORY}/include - ${CMAKE_HOME_DIRECTORY}/src - ${CMAKE_HOME_DIRECTORY}/src/include - ) -else("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_HOME_DIRECTORY}") - set(INCLUDES - ${CMAKE_HOME_DIRECTORY} - ${CMAKE_HOME_DIRECTORY}/include - ${CMAKE_HOME_DIRECTORY}/src - ${CMAKE_HOME_DIRECTORY}/src/include - ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/include - ${CMAKE_BINARY_DIR}/src - ) -endif("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_HOME_DIRECTORY}") - -set(INCLUDES ${INCLUDES} ${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/include ${CMAKE_HOME_DIRECTORY}/src/include ${CMAKE_HOME_DIRECTORY}/src ${CMAKE_BINARY_DIR}/src) +set(INCLUDES + ${CMAKE_HOME_DIRECTORY} + ${CMAKE_HOME_DIRECTORY}/include + ${CMAKE_HOME_DIRECTORY}/src + ${CMAKE_HOME_DIRECTORY}/src/include + ${CMAKE_BINARY_DIR} + ${CMAKE_BINARY_DIR}/include + ${CMAKE_BINARY_DIR}/src + ) + if(WIN32) set(INCLUDES ${INCLUDES} ${CMAKE_HOME_DIRECTORY}/include/xbt ${CMAKE_HOME_DIRECTORY}/src/xbt) #for win32_ucontext.[ch] endif(WIN32) -- 2.20.1