Various CMake fixes for Win build.

GUI/coregui/CMakeLists.txt

@@ -105,6 +105,7 @@ include_directories(
     ${qcustomplot_INCLUDE_DIRS}
     ${qtpropertybrowser_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
+    ${GSL_INCLUDE_DIR}
     ${BornAgainCore_INCLUDE_DIRS}
     ${BornAgainFit_INCLUDE_DIRS}
     ${ManhattanStyle_INCLUDE_DIRS}

GUI/coregui/Models/JobQueueModel.cpp

@@ -289,7 +289,7 @@ void JobQueueModel::readFrom(QXmlStreamReader *reader)
 void JobQueueModel::onSelectionChanged( const QItemSelection &selected, const QItemSelection & /*deselected*/)
 {
     qDebug() << "JobQueueModel::onSelectionChanged" << selected;
-    if(!selected.empty() and !selected.first().indexes().empty()) {
+    if(!selected.empty() &&  !selected.first().indexes().empty()) {
         QModelIndex index = selected.first().indexes().at(0);
         emit selectionChanged(getJobItemForIndex(index));
     }

GUI/externals/qtpropertybrowser/CMakeLists.txt

@@ -19,8 +19,7 @@ set(include_dirs
 
 include_directories(${include_dirs})
 
-
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-overloaded-virtual")
+#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-overloaded-virtual")
 
 set(resource_files
     "qtpropertybrowser.qrc"

GUI/main/CMakeLists.txt

@@ -14,6 +14,7 @@ set(executable_name BornAgain)
 include_directories(
     ${BornAgainGUI_INCLUDE_DIRS}
     ${ManhattanStyle_INCLUDE_DIRS}
+    ${GSL_INCLUDE_DIR}
 )
 
 add_executable(${executable_name} main.cpp)

Tests/UnitTests/TestGUI/CMakeLists.txt

@@ -19,7 +19,7 @@ include_directories(
     ${Boost_INCLUDE_DIRS}
     ${BornAgainCore_INCLUDE_DIRS}
     ${EIGEN3_INCLUDE_DIR}
-#    ${GSL_INCLUDE_DIR}
+    ${GSL_INCLUDE_DIR}
     ${BornAgainGUI_INCLUDE_DIRS}
     ${BornAgainFit_INCLUDE_DIRS}
 )