0023840: CASROOT variable in automake env.sh script is generated incorrectly in produ...

0023848: cmake configuration process doesn't correctly search freetype includes in some cases
checking of existence of freetype2 directory added

diff --git a/src/WOKTclLib/templates/template.cmake b/src/WOKTclLib/templates/template.cmake
index 3c74cb414c74cdfe8cbc2ef2cb57aedb35422b6b..0593c4115e1387c956f90fc4fdbea8ea9075c795 100644 (file)
--- a/src/WOKTclLib/templates/template.cmake
+++ b/src/WOKTclLib/templates/template.cmake
@@ -282,7 +282,7 @@ 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()
+ELSEIF(EXISTS "${3RDPARTY_FREETYPE_INCLUDE_DIR}/freetype2/")
   SET(3RDPARTY_INCLUDE_DIRS "${3RDPARTY_INCLUDE_DIRS};${3RDPARTY_FREETYPE_INCLUDE_DIR}/freetype2")
 ENDIF()
 

diff --git a/src/WOKsite/wok_tclshrc.tcl b/src/WOKsite/wok_tclshrc.tcl
index a959153aa53ae105779a3666a2bf33e2e63122e6..13536b9d5c1993560b89cd9887b4c125150023d7 100644 (file)
--- a/src/WOKsite/wok_tclshrc.tcl
+++ b/src/WOKsite/wok_tclshrc.tcl
@@ -279,7 +279,7 @@ proc wgenprojbat {thePath theIDE} {
     set anOsIncPath [relativePath "$aBox" "$anOsRootPath"]
 
     if { "$theIDE" == "amk" } {
-      regsub -all -- {__CASROOT__}   $anEnvTmpl "\$PWD" anEnvTmpl
+      regsub -all -- {__CASROOT__}   $anEnvTmpl "$aCasRoot" anEnvTmpl
       regsub -all -- {__CASBIN__}    $anEnvTmpl ""      anEnvTmpl
       regsub -all -- {__BIN_PATH__}  $anEnvTmpl "BIN_PATH=\${CASBIN}bin\${CASDEB}"  anEnvTmpl
       regsub -all -- {__LIBS_PATH__} $anEnvTmpl "LIBS_PATH=\${CASBIN}lib\${CASDEB}" anEnvTmpl