Skip to content
Snippets Groups Projects
Commit b74b0094 authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

CMake copy edit

parent 109b3d47
No related branches found
No related tags found
1 merge request!187Minor improvements
Hide whitespace changes
Inline Side-by-side
Base/CMakeLists.txt
+ 1
− 4
View file @ b74b0094
...@@ -16,7 +16,7 @@ MakeLib(${name} ${lib} ${CMAKE_CURRENT_BINARY_DIR}/Wrap ${BORNAGAIN_PYTHON}) ...@@ -16,7 +16,7 @@ MakeLib(${name} ${lib} ${CMAKE_CURRENT_BINARY_DIR}/Wrap ${BORNAGAIN_PYTHON})
set(${lib}_LIBRARY ${lib} PARENT_SCOPE) set(${lib}_LIBRARY ${lib} PARENT_SCOPE)
# --- external dependencies --- # --- external dependences ---
target_link_libraries(${lib} target_link_libraries(${lib}
PRIVATE PRIVATE
...@@ -28,9 +28,6 @@ target_link_libraries(${lib} ...@@ -28,9 +28,6 @@ target_link_libraries(${lib}
target_include_directories(${lib} target_include_directories(${lib}
PUBLIC PUBLIC
${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}
${GSL_INCLUDE_DIR}
${FFTW3_INCLUDE_DIR}
${Boost_INCLUDE_DIRS}
SYSTEM PUBLIC SYSTEM PUBLIC
${EIGEN3_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}
) )
......
Core/CMakeLists.txt
+ 1
− 3
View file @ b74b0094
...@@ -16,7 +16,7 @@ MakeLib(${name} ${lib} ${CMAKE_CURRENT_BINARY_DIR}/Wrap ${BORNAGAIN_PYTHON}) ...@@ -16,7 +16,7 @@ MakeLib(${name} ${lib} ${CMAKE_CURRENT_BINARY_DIR}/Wrap ${BORNAGAIN_PYTHON})
set(${lib}_LIBRARY ${lib} PARENT_SCOPE) set(${lib}_LIBRARY ${lib} PARENT_SCOPE)
# --- external dependencies --- # --- external dependences ---
target_link_libraries(${lib} target_link_libraries(${lib}
PUBLIC PUBLIC
...@@ -30,8 +30,6 @@ target_link_libraries(${lib} ...@@ -30,8 +30,6 @@ target_link_libraries(${lib}
target_include_directories(${lib} target_include_directories(${lib}
PUBLIC ${CMAKE_SOURCE_DIR} PUBLIC ${CMAKE_SOURCE_DIR}
${tspectrum_INCLUDE_DIR}
${Cerf_INCLUDE_DIR}
${CMAKE_SOURCE_DIR}/3rdparty/Core/ # TEMPORARY ${CMAKE_SOURCE_DIR}/3rdparty/Core/ # TEMPORARY
) )
......
Fit/CMakeLists.txt
+ 1
− 2
View file @ b74b0094
...@@ -16,7 +16,7 @@ MakeLib(${name} ${lib} ${CMAKE_CURRENT_BINARY_DIR}/Wrap ${BORNAGAIN_PYTHON}) ...@@ -16,7 +16,7 @@ MakeLib(${name} ${lib} ${CMAKE_CURRENT_BINARY_DIR}/Wrap ${BORNAGAIN_PYTHON})
set(${lib}_LIBRARY ${lib} PARENT_SCOPE) set(${lib}_LIBRARY ${lib} PARENT_SCOPE)
# --- external dependencies --- # --- external dependences ---
target_link_libraries(${lib} target_link_libraries(${lib}
PUBLIC PUBLIC
...@@ -26,6 +26,5 @@ target_link_libraries(${lib} ...@@ -26,6 +26,5 @@ target_link_libraries(${lib}
) )
target_include_directories(${lib} target_include_directories(${lib}
PUBLIC PUBLIC
${RootMinimizers_INCLUDE_DIRS}
${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}
) )
GUI/CMakeLists.txt
+ 13
− 9
View file @ b74b0094
...@@ -12,6 +12,7 @@ add_subdirectory(ba3d) ...@@ -12,6 +12,7 @@ add_subdirectory(ba3d)
set(library_name BornAgainGUI) set(library_name BornAgainGUI)
# --- source and include files --- # --- source and include files ---
set(include_dirs set(include_dirs
${CMAKE_CURRENT_SOURCE_DIR}/Application ${CMAKE_CURRENT_SOURCE_DIR}/Application
${CMAKE_CURRENT_SOURCE_DIR}/mainwindow ${CMAKE_CURRENT_SOURCE_DIR}/mainwindow
...@@ -37,7 +38,6 @@ set(include_dirs ...@@ -37,7 +38,6 @@ set(include_dirs
${CMAKE_CURRENT_SOURCE_DIR}/Views/SpecularDataWidgets ${CMAKE_CURRENT_SOURCE_DIR}/Views/SpecularDataWidgets
) )
set(source_files) set(source_files)
set(include_files) set(include_files)
set(form_files) set(form_files)
...@@ -81,9 +81,11 @@ set(resource_files ...@@ -81,9 +81,11 @@ set(resource_files
) )
# --- Qt configuration --------- # --- Qt configuration ---------
qt5_add_resources(RC_SRCS ${resource_files}) qt5_add_resources(RC_SRCS ${resource_files})
# --- definitions ------ # --- definitions ------
if(BORNAGAIN_CRASHHANDLER) if(BORNAGAIN_CRASHHANDLER)
add_definitions(-DBORNAGAIN_CRASHHANDLER) add_definitions(-DBORNAGAIN_CRASHHANDLER)
endif() endif()
...@@ -92,8 +94,7 @@ if(WIN32) ...@@ -92,8 +94,7 @@ if(WIN32)
string(APPEND CMAKE_CXX_FLAGS " -DBA_CORE_BUILD_DLL") string(APPEND CMAKE_CXX_FLAGS " -DBA_CORE_BUILD_DLL")
endif() endif()
# --- make the library ---------
# --- making library ---------
add_library(${library_name} SHARED ${source_files} ${RC_SRCS} ${include_files} ${form_files}) add_library(${library_name} SHARED ${source_files} ${RC_SRCS} ${include_files} ${form_files})
set_target_properties(${library_name} PROPERTIES PREFIX ${libprefix} SUFFIX ${libsuffix}) set_target_properties(${library_name} PROPERTIES PREFIX ${libprefix} SUFFIX ${libsuffix})
...@@ -102,12 +103,11 @@ set(${library_name}_LIBRARY_TYPE SHARED) ...@@ -102,12 +103,11 @@ set(${library_name}_LIBRARY_TYPE SHARED)
set(${library_name}_INCLUDE_DIRS ${include_dirs}) set(${library_name}_INCLUDE_DIRS ${include_dirs})
set(${library_name}_LIBRARY ${library_name}) set(${library_name}_LIBRARY ${library_name})
# --- switch OFF Qt debug output in any configuration except DEBUG # switch OFF Qt debug output in any configuration except DEBUG
target_compile_definitions(${library_name} PUBLIC $<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG_OUTPUT>) target_compile_definitions(${library_name} PUBLIC $<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG_OUTPUT>)
# --- dependencies --------- # --- external dependences ---------
target_include_directories(${library_name} PUBLIC
${CMAKE_SOURCE_DIR})
target_link_libraries(${library_name} target_link_libraries(${library_name}
PUBLIC PUBLIC
${BornAgainCore_LIBRARY} ${BornAgainCore_LIBRARY}
...@@ -120,8 +120,11 @@ target_link_libraries(${library_name} ...@@ -120,8 +120,11 @@ target_link_libraries(${library_name}
Qt5::PrintSupport Qt5::PrintSupport
qcustomplot qcustomplot
) )
target_include_directories(${library_name} PUBLIC
${CMAKE_SOURCE_DIR})
# --- installation ---------
# --- Installation ---------
install (TARGETS ${library_name} DESTINATION ${destination_lib} COMPONENT Libraries) install (TARGETS ${library_name} DESTINATION ${destination_lib} COMPONENT Libraries)
if(WIN32) if(WIN32)
...@@ -167,7 +170,8 @@ endif() ...@@ -167,7 +170,8 @@ endif()
add_subdirectory(main) add_subdirectory(main)
# Transmit variables for use in tests # --- Transmit variables for use in tests
set(BornAgainGUI_INCLUDE_DIRS ${BornAgainGUI_INCLUDE_DIRS} PARENT_SCOPE) set(BornAgainGUI_INCLUDE_DIRS ${BornAgainGUI_INCLUDE_DIRS} PARENT_SCOPE)
set(BornAgainGUI_LIBRARY ${BornAgainGUI_LIBRARY} PARENT_SCOPE) set(BornAgainGUI_LIBRARY ${BornAgainGUI_LIBRARY} PARENT_SCOPE)
......
Param/CMakeLists.txt
+ 1
− 1
View file @ b74b0094
...@@ -16,7 +16,7 @@ MakeLib(${name} ${lib} ${CMAKE_CURRENT_BINARY_DIR}/Wrap ${BORNAGAIN_PYTHON}) ...@@ -16,7 +16,7 @@ MakeLib(${name} ${lib} ${CMAKE_CURRENT_BINARY_DIR}/Wrap ${BORNAGAIN_PYTHON})
set(${lib}_LIBRARY ${lib} PARENT_SCOPE) set(${lib}_LIBRARY ${lib} PARENT_SCOPE)
# --- external dependencies --- # --- external dependences ---
target_link_libraries(${lib} target_link_libraries(${lib}
PUBLIC PUBLIC
......
Resample/CMakeLists.txt
+ 1
− 1
View file @ b74b0094
...@@ -16,7 +16,7 @@ MakeLib(${name} ${lib} ${CMAKE_CURRENT_BINARY_DIR}/Wrap ${BORNAGAIN_PYTHON}) ...@@ -16,7 +16,7 @@ MakeLib(${name} ${lib} ${CMAKE_CURRENT_BINARY_DIR}/Wrap ${BORNAGAIN_PYTHON})
set(${lib}_LIBRARY ${lib} PARENT_SCOPE) set(${lib}_LIBRARY ${lib} PARENT_SCOPE)
# --- external dependencies --- # --- external dependences ---
target_link_libraries(${lib} target_link_libraries(${lib}
PUBLIC PUBLIC
......
Sample/CMakeLists.txt
+ 1
− 1
View file @ b74b0094
...@@ -16,7 +16,7 @@ MakeLib(${name} ${lib} ${CMAKE_CURRENT_BINARY_DIR}/Wrap ${BORNAGAIN_PYTHON}) ...@@ -16,7 +16,7 @@ MakeLib(${name} ${lib} ${CMAKE_CURRENT_BINARY_DIR}/Wrap ${BORNAGAIN_PYTHON})
set(${lib}_LIBRARY ${lib} PARENT_SCOPE) set(${lib}_LIBRARY ${lib} PARENT_SCOPE)
# --- external dependencies --- # --- external dependences ---
target_link_libraries(${lib} target_link_libraries(${lib}
PUBLIC PUBLIC
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment