Merge changes from 'master' branch.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 14f564b479f9b70a2133038733ecf51380c882b2..45c37673723c719f80e9264b1c58b0ec61b5f4c6 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,7 +31,7 @@ ENDIF(WIN32)
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
 SET(${PROJECT_NAME_UC}_MAJOR_VERSION 8)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 3)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 4)
 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})

diff --git a/src/AtomicPy/CMakeLists.txt b/src/AtomicPy/CMakeLists.txt
index 4191ac9b3d12b8899d3bbdd52128407f8c2d8984..a132640b0d2933b51bb933d4603a7889e01b058d 100755 (executable)
--- a/src/AtomicPy/CMakeLists.txt
+++ b/src/AtomicPy/CMakeLists.txt
@@ -25,8 +25,8 @@ INCLUDE(UsePyQt)
 INCLUDE_DIRECTORIES(
   $(QT_INCLUDES)
   ${GUI_INCLUDE_DIRS}
-  ${SIP_INCLUDE_DIR}
   ${PYTHON_INCLUDE_DIRS}
+  ${SIP_INCLUDE_DIR}
   ${PROJECT_BINARY_DIR}
   ${PROJECT_SOURCE_DIR}/src/ATOMICGUI
 )