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

CMake: don't include header files in source lists

parent b4a05bbc
No related branches found
No related tags found
No related merge requests found
...@@ -134,7 +134,7 @@ endif() ...@@ -134,7 +134,7 @@ endif()
# --- making library --------- # --- making library ---------
add_library(${library_name} SHARED ${include_files} ${source_files}) add_library(${library_name} SHARED ${source_files})
set_target_properties(${library_name} PROPERTIES PREFIX ${libprefix} SUFFIX ${libsuffix}) set_target_properties(${library_name} PROPERTIES PREFIX ${libprefix} SUFFIX ${libsuffix})
set(${library_name}_LIBRARY_TYPE SHARED) set(${library_name}_LIBRARY_TYPE SHARED)
......
...@@ -88,7 +88,6 @@ if(BORNAGAIN_PYTHON) ...@@ -88,7 +88,6 @@ if(BORNAGAIN_PYTHON)
endif() endif()
list(APPEND source_files "${AUTO_DIR}/libBornAgainFit_wrap.cpp") list(APPEND source_files "${AUTO_DIR}/libBornAgainFit_wrap.cpp")
#list(APPEND include_files "${AUTO_DIR}/libBornAgainFit_wrap.h")
endif() endif()
...@@ -98,7 +97,7 @@ if(WIN32) ...@@ -98,7 +97,7 @@ if(WIN32)
endif() endif()
# --- making library --------- # --- making library ---------
add_library(${library_name} SHARED ${include_files} ${source_files}) add_library(${library_name} SHARED ${source_files})
set_target_properties(${library_name} PROPERTIES PREFIX ${libprefix} SUFFIX ${libsuffix}) set_target_properties(${library_name} PROPERTIES PREFIX ${libprefix} SUFFIX ${libsuffix})
set(${library_name}_LIBRARY_TYPE SHARED) set(${library_name}_LIBRARY_TYPE SHARED)
......
...@@ -9,9 +9,8 @@ set(resource_files ...@@ -9,9 +9,8 @@ set(resource_files
) )
qt5_add_resources(RC_SHADERS ${resource_files}) qt5_add_resources(RC_SHADERS ${resource_files})
add_library (${lib} STATIC ${source_files} ${include_files} ${RC_SHADERS}) add_library (${lib} STATIC ${source_files} ${RC_SHADERS})
target_link_libraries (${lib} target_link_libraries (${lib}
Qt5::Core Qt5::Widgets Qt5::OpenGL Qt5::Core Qt5::Widgets Qt5::OpenGL
) )
...@@ -37,7 +37,7 @@ endif() ...@@ -37,7 +37,7 @@ endif()
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
add_executable(${executable_name} add_executable(${executable_name}
${executable_options} ${executable_options}
${source_files} ${include_files} ${source_files}
${system_addons}) ${system_addons})
......
...@@ -19,16 +19,6 @@ file(GLOB source_files ...@@ -19,16 +19,6 @@ file(GLOB source_files
"base/*.cxx" "base/*.cxx"
) )
file(GLOB include_files
"base/*.h"
"Minuit2/*.h"
"Math/*.h"
"mathcore/Math/*.h"
"Fit/*.h"
"TMVA/*.h"
"base/*.h"
)
# --- definitions --------- # --- definitions ---------
add_definitions(-DWARNINGMSG) add_definitions(-DWARNINGMSG)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMATH_NO_PLUGIN_MANAGER -DHAS_MINUIT2 -DR__HAS_MATHMORE") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMATH_NO_PLUGIN_MANAGER -DHAS_MINUIT2 -DR__HAS_MATHMORE")
...@@ -39,7 +29,7 @@ else() ...@@ -39,7 +29,7 @@ else()
endif() endif()
# --- making library ------------ # --- making library ------------
add_library(${library_name} STATIC ${source_files} ${include_files}) add_library(${library_name} STATIC ${source_files})
set(${library_name}_INCLUDE_DIRS ${include_dirs} CACHE INTERNAL "") set(${library_name}_INCLUDE_DIRS ${include_dirs} CACHE INTERNAL "")
set(${library_name}_LIBRARY ${library_name} CACHE INTERNAL "") set(${library_name}_LIBRARY ${library_name} CACHE INTERNAL "")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment