From 9ccea0c628dbff057bb77c2a10a740bd790c31c2 Mon Sep 17 00:00:00 2001 From: ibs Date: Wed, 4 Feb 2015 12:18:04 +0300 Subject: [PATCH] 0025791: Impossibility to generate projects for Foundation Classes without TclTk/Freetype using CMake unset redundant variables --- CMakeLists.txt | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 02ac8ea252..cc7225e3da 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -86,8 +86,8 @@ if ("${3RDPARTY_DIR}" STREQUAL "") set (3RDPARTY_DIR "$ENV{3RDPARTY_DIR}" CACHE PATH ${3RDPARTY_DIR_LABEL} FORCE) elseif (EXISTS "${CMAKE_SOURCE_DIR}/../") # in version 6.7.0 and above, occt parent directory contains 3rdparties - GET_FILENAME_COMPONENT(3RDPARTY_DIR "${CMAKE_SOURCE_DIR}/../" ABSOLUTE) - SET(3RDPARTY_DIR "${3RDPARTY_DIR}" CACHE PATH ${3RDPARTY_DIR_LABEL} FORCE) + get_filename_component (3RDPARTY_DIR "${CMAKE_SOURCE_DIR}/../" ABSOLUTE) + set (3RDPARTY_DIR "${3RDPARTY_DIR}" CACHE PATH ${3RDPARTY_DIR_LABEL} FORCE) endif() endif() @@ -98,13 +98,8 @@ if ("${USE_TCL}" STREQUAL ON) message (STATUS "Info: tcl is used by OCCT") OCCT_INCLUDE_CMAKE_FILE ("adm/templates/tcl") else() - OCCT_CHECK_AND_UNSET ("3RDPARTY_TCL_DIR") - OCCT_CHECK_AND_UNSET ("3RDPARTY_TCL_INCLUDE_DIR") - OCCT_CHECK_AND_UNSET ("3RDPARTY_TCL_LIBRARY") - OCCT_CHECK_AND_UNSET ("3RDPARTY_TCL_LIBRARY_DIR") - OCCT_CHECK_AND_UNSET ("3RDPARTY_TK_INCLUDE_DIR") - OCCT_CHECK_AND_UNSET ("3RDPARTY_TK_LIBRARY") - OCCT_CHECK_AND_UNSET ("3RDPARTY_TK_LIBRARY_DIR") + OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_TCL") + OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_TK") endif() # search for CSF_FREETYPE variable in EXTERNLIB of each being used toolkit @@ -114,11 +109,9 @@ if ("${USE_FREETYPE}" STREQUAL ON) message (STATUS "Info: freetype is used by OCCT") OCCT_INCLUDE_CMAKE_FILE ("adm/templates/freetype") else() - OCCT_CHECK_AND_UNSET ("3RDPARTY_FREETYPE_DIR") + OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_FREETYPE") OCCT_CHECK_AND_UNSET ("3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2") OCCT_CHECK_AND_UNSET ("3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build") - OCCT_CHECK_AND_UNSET ("3RDPARTY_FREETYPE_LIBRARY") - OCCT_CHECK_AND_UNSET ("3RDPARTY_FREETYPE_LIBRARY_DIR") endif() # VTK @@ -167,7 +160,7 @@ endif() # TBB if (USE_TBB) - ADD_DEFINITIONS(-DHAVE_TBB) + add_definitions (-DHAVE_TBB) OCCT_INCLUDE_CMAKE_FILE ("adm/templates/tbb") else() OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_TBB") -- 2.20.1