Merge branch 'ff70' into 'develop'

CMake: minor improvements

See merge request !514

CMakeLists.txt

@@ -111,14 +111,19 @@ include(BornAgain/MakeLib) # fct MakeLib
 
 include(BornAgain/Directories)
 
-if(CMAKE_SYSTEM_NAME MATCHES Linux)
-    include(BornAgain/Linux)
-    include(BornAgain/NixInstall)
-elseif(APPLE)
-    include(BornAgain/MacOS)
+if(UNIX)
+    if(CMAKE_SYSTEM_NAME MATCHES Linux)
+        include(BornAgain/Linux)
+    elseif(APPLE)
+        include(BornAgain/MacOS)
+    else()
+        message(FATAL_ERROR "Operating system ${CMAKE_SYSTEM_NAME} not supported")
+    endif()
     include(BornAgain/NixInstall)
 elseif(WIN32)
     include(BornAgain/Windows)
+else()
+    message(FATAL_ERROR "Operating system ${CMAKE_SYSTEM_NAME} is neither UNIX nor WIN32")
 endif()
 
 include(BornAgain/Compiler)

cmake/BornAgain/Dependences.cmake

@@ -4,11 +4,11 @@ if(WIN32)
     set(CMAKE_FIND_LIBRARY_SUFFIXES .dll.a .lib)
 endif()
 
-find_package(LibHeinz REQUIRED)
+find_package(LibHeinz REQUIRED CONFIG)
 message(STATUS "LibHeinz: found=${LibHeinz_FOUND}, include_dirs=${LibHeinz_INCLUDE_DIR}, "
     "version=${LibHeinz_VERSION}")
 
-#find_package(formfactor REQUIRED)
+#find_package(formfactor REQUIRED CONFIG)
 #message(STATUS "formfactor: found=${formfactor_FOUND}, version=${formfactor_VERSION}")
 
 find_package(Threads REQUIRED)