0023848: cmake configuration process doesn't correctly search freetype includes in...

also path to env.sh corrected in draw.sh
Light update

diff --git a/src/WOKBuilderDef/CSF.edl b/src/WOKBuilderDef/CSF.edl
index 86dc6bdfa1ac58f13f90b1544de4b01122b6fd4c..53bc8945e4e2c4e8ba7d6645fc70c2765dc9ab04 100755 (executable)
--- a/src/WOKBuilderDef/CSF.edl
+++ b/src/WOKBuilderDef/CSF.edl
@@ -51,6 +51,7 @@
 
   @set %CSF_JavaHome = "";
   @set %CSF_JavaLibs = "";
+  @string %CXX_JAVA = "";
 
   @string %CSF_C_INCLUDE   = "";
   @string %CSF_CXX_INCLUDE = "";

diff --git a/src/WOKTclLib/templates/draw.sh b/src/WOKTclLib/templates/draw.sh
index 2e68b3be9d6c3b9126de06000d6f9eb186f852e1..5dc0f24e62717322b1d4a70a60e3cccdcf020f85 100644 (file)
--- a/src/WOKTclLib/templates/draw.sh
+++ b/src/WOKTclLib/templates/draw.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 
-source ./env.sh "$1"
+aScriptPath=${BASH_SOURCE%/*}; if [ -d "${aScriptPath}" ]; then cd "$aScriptPath"; fi; aScriptPath="$PWD";
+
+source "${aScriptPath}/env.sh" "$1"
 
 echo 'Hint: use "pload ALL" command to load standard commands'
 DRAWEXE

diff --git a/src/WOKTclLib/templates/template.ac b/src/WOKTclLib/templates/template.ac
index c9f0fc02994fa7a8095d74cfaaf5e00b55053e08..d62e98ead1287d6d65675c8d4318656da56220ad 100644 (file)
--- a/src/WOKTclLib/templates/template.ac
+++ b/src/WOKTclLib/templates/template.ac
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([OpenCASCADE], [6.5.4])
+AC_INIT([OpenCASCADE], [6.6.0])
 AC_CONFIG_AUX_DIR(make)
 AM_INIT_AUTOMAKE([foreign])
 AC_CANONICAL_HOST

diff --git a/src/WOKTclLib/templates/template.cmake b/src/WOKTclLib/templates/template.cmake
index 04ce5b830ce06be90a751ac68729b834d293c06b..3c74cb414c74cdfe8cbc2ef2cb57aedb35422b6b 100644 (file)
--- a/src/WOKTclLib/templates/template.cmake
+++ b/src/WOKTclLib/templates/template.cmake
@@ -197,10 +197,15 @@ MACRO(THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_NAME)
   
   SET(INSTALL_${PRODUCT_NAME} OFF CACHE BOOL "Is ${PRODUCT_NAME} lib copy to install directory")
 
-  IF(3RDPARTY_${PRODUCT_NAME}_DIR)    
-    IF("${3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR}" STREQUAL "" OR CHANGES_ARE_NEEDED)
+  IF(3RDPARTY_${PRODUCT_NAME}_DIR)
+    IF("${3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR}" STREQUAL "" OR CHANGES_ARE_NEEDED OR "${3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR}" STREQUAL "3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR-NOTFOUND")
       SET(3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR "3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR-NOTFOUND" CACHE FILEPATH "Directory contains headers of the ${PRODUCT_NAME} product" FORCE)
-      FIND_PATH(3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR ${HEADER_NAME} PATHS "${3RDPARTY_${PRODUCT_NAME}_DIR}/include")    
+      FIND_PATH(3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR ${HEADER_NAME} PATHS "${3RDPARTY_${PRODUCT_NAME}_DIR}/include" NO_DEFAULT_PATH)
+      
+      IF("${3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR}" STREQUAL "3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR-NOTFOUND")
+        FIND_PATH(3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR ${HEADER_NAME})
+      ENDIF()
+      
     ENDIF()
     
     IF("${3RDPARTY_${PRODUCT_NAME}_LIBRARY}" STREQUAL "" OR CHANGES_ARE_NEEDED OR "${3RDPARTY_${PRODUCT_NAME}_LIBRARY}" STREQUAL "3RDPARTY_${PRODUCT_NAME}_LIBRARY-NOTFOUND")
@@ -273,7 +278,13 @@ IF(INSTALL_TCL)
 ENDIF()
 
 # FREETYPE
-THIRDPARTY_PRODUCT("FREETYPE" "freetype/freetype.h" "freetype${BUILD_SUFFIX}")
+THIRDPARTY_PRODUCT("FREETYPE" "ft2build.h" "freetype${BUILD_SUFFIX}")
+
+IF("${3RDPARTY_FREETYPE_INCLUDE_DIR}" STREQUAL "" OR "${3RDPARTY_FREETYPE_INCLUDE_DIR}" STREQUAL "3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR-NOTFOUND")
+  
+ELSE()
+  SET(3RDPARTY_INCLUDE_DIRS "${3RDPARTY_INCLUDE_DIRS};${3RDPARTY_FREETYPE_INCLUDE_DIR}/freetype2")
+ENDIF()
 
 # FREEIMAGE
 IF(3RDPARTY_USE_FREEIMAGE)