X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=CMakeLists.txt;h=0fc69bb94320fbeafffc75aca2a0ea44a42e1a12;hp=490c0e00878465dc01cf356c332fdb633ac8805b;hb=43501153a0356826449c59fe089b3497ebde09ff;hpb=e0c0345b71c38b6948706085273629f02d6c7293 diff --git a/CMakeLists.txt b/CMakeLists.txt index 490c0e008..0fc69bb94 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,6 +21,9 @@ PROJECT(SalomeSMESH 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 # =========== @@ -28,11 +31,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 # =================== @@ -306,7 +309,7 @@ ENDIF(SALOME_SMESH_ENABLE_MEFISTO) IF(SALOME_BUILD_GUI) LIST(APPEND _${PROJECT_NAME}_exposed_targets - SMESHObject SMESHFiltersSelection SMESH GeomSelectionTools StdMeshersGUI + SMESHObject SMESHFiltersSelection SMESH PluginUtils StdMeshersGUI ) ENDIF(SALOME_BUILD_GUI)