diff --git a/GUI/coregui/CMakeLists.txt b/GUI/coregui/CMakeLists.txt
index 965d4b8b2dc308dffe9c56556e9ec375dd6f65b2..707ec0694c420604cbb5dbb940030abad618b9ac 100644
--- a/GUI/coregui/CMakeLists.txt
+++ b/GUI/coregui/CMakeLists.txt
@@ -39,17 +39,17 @@ foreach(dir ${include_dirs})
endforeach()
set(source_widgetbox
- "Views/widgetbox/widgetboxcategorylistview.cpp"
- "Views/widgetbox/widgetboxtreewidget.cpp"
- "Views/widgetbox/widgetbox.cpp"
+ Views/widgetbox/widgetboxcategorylistview.cpp
+ Views/widgetbox/widgetboxtreewidget.cpp
+ Views/widgetbox/widgetbox.cpp
)
list(APPEND source_files ${source_widgetbox})
set(include_widgetbox
- "Views/widgetbox/widgetboxcategorylistview.h"
- "Views/widgetbox/widgetboxtreewidget.h"
- "Views/widgetbox/widgetbox.h"
- "Views/widgetbox/widgetbox_global.h"
+ Views/widgetbox/widgetboxcategorylistview.h
+ Views/widgetbox/widgetboxtreewidget.h
+ Views/widgetbox/widgetbox.h
+ Views/widgetbox/widgetbox_global.h
)
if(WIN32)
add_definitions(-DQDESIGNER_UILIB_LIBRARY)
@@ -60,11 +60,11 @@ list(APPEND include_files ${include_widgetbox})
list(APPEND include_dirs ${CMAKE_CURRENT_SOURCE_DIR}/Views/widgetbox)
set(resource_files
- "coregui.qrc"
- "Views/SampleDesigner/SampleDesigner.qrc"
- "Views/MaskWidgets/MaskWidgets.qrc"
- "Views/widgetbox/widgetbox.qrc"
- "Views/AccordionWidget/accordionwidgeticons.qrc"
+ coregui.qrc
+ Views/SampleDesigner/SampleDesigner.qrc
+ Views/MaskWidgets/MaskWidgets.qrc
+ Views/widgetbox/widgetbox.qrc
+ Views/AccordionWidget/accordionwidgeticons.qrc
)
# --- Qt configuration ---------
@@ -77,7 +77,7 @@ if(BORNAGAIN_CRASHHANDLER)
endif()
if(WIN32)
- string(APPEND CMAKE_CXX_FLAGS " -DBA_CORE_BUILD_DLL")
+ string(APPEND CMAKE_CXX_FLAGS -DBA_CORE_BUILD_DLL)
endif()
@@ -139,13 +139,13 @@ if(WIN32)
${QTDIR}/bin/libGLESv2.dll
DESTINATION ${destination_lib} COMPONENT Libraries)
- set(QT_VISTA_STYLE "${QTDIR}/plugins/styles/qwindowsvistastyle.dll")
- if(EXISTS "${QT_VISTA_STYLE}")
+ set(QT_VISTA_STYLE ${QTDIR}/plugins/styles/qwindowsvistastyle.dll)
+ if(EXISTS ${QT_VISTA_STYLE})
install(FILES ${QT_VISTA_STYLE}
DESTINATION bin/styles COMPONENT Libraries)
- else(EXISTS "${QT_VISTA_STYLE}")
- MESSAGE(AUTHOR_WARNING "File ${QT_VISTA_STYLE} not found.")
- endif(EXISTS "${QT_VISTA_STYLE}")
+ else(EXISTS ${QT_VISTA_STYLE})
+ MESSAGE(AUTHOR_WARNING File ${QT_VISTA_STYLE} not found.)
+ endif(EXISTS ${QT_VISTA_STYLE})
unset(QT_VISTA_STYLE)
endif()
diff --git a/GUI/main/CMakeLists.txt b/GUI/main/CMakeLists.txt
index 2acb75efd7c7b4b77a81ac0dae6f796e977b385b..0e3b828bb21d42c5688812be75ed79ccdd86477e 100644
--- a/GUI/main/CMakeLists.txt
+++ b/GUI/main/CMakeLists.txt
@@ -31,7 +31,6 @@ if(APPLE)
endif()
endif()
-
# -----------------------------------------------------------------------------
# executable
# -----------------------------------------------------------------------------
@@ -40,27 +39,25 @@ add_executable(${executable_name}
${source_files}
${system_addons})
-
# -----------------------------------------------------------------------------
# dependencies
# -----------------------------------------------------------------------------
target_link_libraries(${executable_name} ${BornAgainGUI_LIBRARY})
-
# -----------------------------------------------------------------------------
# extra target properties
# -----------------------------------------------------------------------------
if(WIN32)
- set_target_properties( ${executable_name} PROPERTIES LINK_FLAGS "/ENTRY:mainCRTStartup" )
+ set_target_properties(${executable_name} PROPERTIES LINK_FLAGS /ENTRY:mainCRTStartup)
if(win32_console)
- set_target_properties( ${executable_name} PROPERTIES COMPILE_DEFINITIONS "_CONSOLE" )
+ set_target_properties(${executable_name} PROPERTIES COMPILE_DEFINITIONS _CONSOLE)
endif()
endif()
if(APPLE)
- set(MACOSX_BUNDLE_IDENTIFIER "org.bornagainproject.BornAgain")
- configure_file("${CONFIGURABLES_DIR}/MacOSXBundleInfo.plist.in"
- "${BUILD_VAR_DIR}/Info.plist" @ONLY)
+ set(MACOSX_BUNDLE_IDENTIFIER org.bornagainproject.BornAgain)
+ configure_file(${CONFIGURABLES_DIR}/MacOSXBundleInfo.plist.in
+ ${BUILD_VAR_DIR}/Info.plist @ONLY)
set_target_properties(${executable_name}
PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${BUILD_VAR_DIR}/Info.plist)
@@ -76,7 +73,6 @@ if(APPLE)
set_target_properties(${executable_name} PROPERTIES LINK_FLAGS ${link_flags})
endif()
-
# -----------------------------------------------------------------------------
# installation section
# -----------------------------------------------------------------------------
@@ -85,7 +81,7 @@ if(BORNAGAIN_APPLE_BUNDLE)
elseif(WIN32)
set(executable_destination DESTINATION ${destination_gui})
else()
- set(executable_destination DESTINATION "${destination_gui}/exec")
+ set(executable_destination DESTINATION ${destination_gui}/exec)
endif()
#message(STATUS "Executable destination is ${executable_destination}")
install (TARGETS ${executable_name} ${executable_destination} COMPONENT Applications)
@@ -97,18 +93,15 @@ set(image_files
${CMAKE_SOURCE_DIR}/GUI/coregui/images/BornAgain_64x64.png)
install (FILES ${image_files} DESTINATION ${destination_images} COMPONENT Applications)
-
# -----------------------------------------------------------------------------
# system dependent installation
# -----------------------------------------------------------------------------
if(UNIX)
if(BORNAGAIN_APPLE_BUNDLE)
- install( FILES ${CMAKE_SOURCE_DIR}/GUI/main/BornAgain.icns
- DESTINATION ${destination_bundle}/Contents/Resources/
- )
- install( FILES ${CMAKE_SOURCE_DIR}/cmake/configurables/qt.conf
- DESTINATION ${destination_bundle}/Contents/Resources/
- )
+ install(FILES ${CMAKE_SOURCE_DIR}/GUI/main/BornAgain.icns
+ DESTINATION ${destination_bundle}/Contents/Resources/)
+ install(FILES ${CMAKE_SOURCE_DIR}/cmake/configurables/qt.conf
+ DESTINATION ${destination_bundle}/Contents/Resources/)
configure_file(${CMAKE_SOURCE_DIR}/cmake/configurables/FixAppleBundle.cmake.in
${BUILD_VAR_DIR}/FixAppleBundle.cmake @ONLY)
install(SCRIPT ${BUILD_VAR_DIR}/FixAppleBundle.cmake COMPONENT Runtime)