X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=a24f5c22dde2c4efc827f12293895ad3ad23a1b8;hb=caf945fd0c26bc81b86717e955c4a79613220530;hp=c4b8e697ce8c20fb90ec3abdd6143c1f2dc0feec;hpb=291ceeb6e63a94943b25e3b31aac144c521117d0;p=modules%2Fyacs.git diff --git a/CMakeLists.txt b/CMakeLists.txt index c4b8e697c..a24f5c22d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,6 +23,9 @@ PROJECT(SalomeYACS C CXX) # Ensure a proper linker behavior: CMAKE_POLICY(SET CMP0003 NEW) +IF(WIN32) + CMAKE_POLICY(SET CMP0020 OLD) # disable automatic linking to qtmain.lib +ENDIF(WIN32) # Versioning # =========== @@ -30,11 +33,11 @@ CMAKE_POLICY(SET CMP0003 NEW) STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC) SET(${PROJECT_NAME_UC}_MAJOR_VERSION 8) -SET(${PROJECT_NAME_UC}_MINOR_VERSION 0) +SET(${PROJECT_NAME_UC}_MINOR_VERSION 1) SET(${PROJECT_NAME_UC}_PATCH_VERSION 0) SET(${PROJECT_NAME_UC}_VERSION ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION}) -SET(${PROJECT_NAME_UC}_VERSION_DEV 1) +SET(${PROJECT_NAME_UC}_VERSION_DEV 0) # Common CMake macros # =================== @@ -292,7 +295,7 @@ SET(_${PROJECT_NAME}_exposed_targets IF(SALOME_YACS_USE_KERNEL) LIST(APPEND _${PROJECT_NAME}_exposed_targets - SalomeIDLYACS YACSRuntimeSALOME YACSloader + SalomeIDLYACS YACSRuntimeSALOME YACSloader YACSevalYFX ) ENDIF(SALOME_YACS_USE_KERNEL) @@ -309,7 +312,7 @@ ENDIF(SALOME_BUILD_TESTS) IF(SALOME_BUILD_GUI) LIST(APPEND _${PROJECT_NAME}_exposed_targets - HMI GenericGui YACS SalomeWrap + HMI ydfxwidgets GenericGui YACS SalomeWrap ) ENDIF(SALOME_BUILD_GUI)