Salome HOME
projects
/
plugins
/
ghs3dprlplugin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CMake improvement: usage of SALOME_GUI_MODE() macro
[plugins/ghs3dprlplugin.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index a656fa4b8ea11c02b56536dcf5132e8db2c52647..dfd77c97e92c371201a318fc410259b2b3756647 100755
(executable)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-1,4
+1,4
@@
-# Copyright (C) 2012-201
4
CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@
-28,11
+28,11
@@
CMAKE_POLICY(SET CMP0003 NEW)
STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7)
STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION
5
)
-SET(${PROJECT_NAME_UC}_PATCH_VERSION
1
)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION
6
)
+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
${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
-SET(${PROJECT_NAME_UC}_VERSION_DEV
0
)
+SET(${PROJECT_NAME_UC}_VERSION_DEV
1
)
# Find KERNEL
# ===========
# Find KERNEL
# ===========
@@
-95,7
+95,7
@@
IF(SALOME_BUILD_GUI)
IF(EXISTS ${GUI_ROOT_DIR})
LIST(APPEND CMAKE_MODULE_PATH "${GUI_ROOT_DIR}/adm_local/cmake_files")
FIND_PACKAGE(SalomeGUI)
IF(EXISTS ${GUI_ROOT_DIR})
LIST(APPEND CMAKE_MODULE_PATH "${GUI_ROOT_DIR}/adm_local/cmake_files")
FIND_PACKAGE(SalomeGUI)
-
FULL_GUI(TRUE) # check whether GUI builded in full mode an
d with CORBA
+
SALOME_GUI_WITH_CORBA() # check whether GUI builde
d with CORBA
ADD_DEFINITIONS(${GUI_DEFINITIONS})
INCLUDE_DIRECTORIES(${GUI_INCLUDE_DIRS})
ELSE(EXISTS ${GUI_ROOT_DIR})
ADD_DEFINITIONS(${GUI_DEFINITIONS})
INCLUDE_DIRECTORIES(${GUI_INCLUDE_DIRS})
ELSE(EXISTS ${GUI_ROOT_DIR})