Merge branch 'sf1' into 'develop'

CMake patches; rename Unix executable to lowercase "bornagain"

See merge request !375

CHANGELOG

@@ -9,7 +9,8 @@ BornAgain-1.20?
     * Support soft-matter reflectometry parameterization files of Anaklasis
     * Remove FormFactorDot to avoid its inherent inconsistencies (use small sphere instead)
     * Remove unused/undocumented functions Layer::setThickness, setMaterial
-  > GUI changes:
+> GUI changes:
+    * Executable renamed to bornagain, except under Windows, where it is still BornAgain
     * Support "*.001" files generated by Nicos at SANS-1 of MLZ / FRM2
     * Improved file chooser for 2d data import
   > Bug fixes:

Doc/man/CMakeLists.txt

@@ -8,7 +8,8 @@ add_custom_target(
 
 add_custom_command(
     OUTPUT ${AUTO_DIR}/bornagain.1
-    COMMAND ${POD2MAN} -s 1 -c "BornAgain manual" ${CMAKE_CURRENT_SOURCE_DIR}/bornagain.pod ${AUTO_DIR}/bornagain.1
+    COMMAND ${POD2MAN} -s 1 -c "BornAgain manual"
+            ${CMAKE_CURRENT_SOURCE_DIR}/bornagain.pod ${AUTO_DIR}/bornagain.1
     DEPENDS bornagain.pod
 )
 

GUI/main/CMakeLists.txt

 ###############################################################################
 # Builds BornAgain/GUI main executable
 ###############################################################################
-set(executable_name BornAgain)
+
+if(WIN32)
+    set(executable_name BornAgain)
+else()
+    set(executable_name bornagain)
+endif()
 
 set(source_files main.cpp appoptions.cpp MessageHandler.cpp)
 set(include_files appoptions.h MessageHandler.h )

cmake/BornAgain/Linux.cmake

 set(BORNAGAIN_ARCHITECTURE linux)
 set(BORNAGAIN_PLATFORM linux)
 
-execute_process(COMMAND uname -m OUTPUT_VARIABLE SYSCTL_OUTPUT)
-if(${SYSCTL_OUTPUT} MATCHES x86_64)
+if(CMAKE_SIZEOF_VOID_P GREATER 4)
     message(STATUS "Found a 64bit system")
-    set(BIT_ENVIRONMENT "-m64")
-    set(BORNAGAIN_ARCHITECTURE linuxx8664)
+    if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL x86_64)
+        set(BORNAGAIN_ARCHITECTURE linuxx8664)
+    endif()
 else()
     message(STATUS "Found a 32bit system")
-    set(BIT_ENVIRONMENT "-m32")
     add_definitions(-DEIGEN_DONT_ALIGN_STATICALLY=1)
 endif()