From 12a6a7634124a62139b86ecb33568e9ac1df61de Mon Sep 17 00:00:00 2001 From: Michael Fabian 'Xaymar' Dirks Date: Mon, 27 Jul 2020 08:22:07 +0200 Subject: [PATCH] cmake: Fix Clang toolset support --- CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b9d47f..a4eefb4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,24 +74,24 @@ set(PROJECT_COPYRIGHT_YEARS "2018 - 2020") # Setup / Bootstrap ################################################################################ +# Detect Build Type +if("${CMAKE_SOURCE_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}") + set(PropertyPrefix "") +else() + set(PropertyPrefix "${PROJECT_NAME}_") +endif() + # Search Path set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/clang" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" "${CMAKE_CURRENT_SOURCE_DIR}/cmake") # CMake Modules include("util") ## Clang Integration -if(${PropertyPrefix}ENABLE_CLANG AND (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Clang/Clang.cmake")) +if(${PropertyPrefix}ENABLE_CLANG AND (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/cmake/clang/Clang.cmake")) include("Clang") set(HAVE_CLANG ON) endif() -# Detect Build Type -if("${CMAKE_SOURCE_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}") - set(PropertyPrefix "") -else() - set(PropertyPrefix "${PROJECT_NAME}_") -endif() - # Detect Architecture math(EXPR BITS "8*${CMAKE_SIZEOF_VOID_P}") if("${BITS}" STREQUAL "32")