detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-08 19:10:42 +02:00
Code Issues Actions Packages Releases Activity

turned off -Wshadow for gcc

Browse Source
This commit is contained in:
Erik Frojdh 2019-04-08 09:28:40 +02:00
parent 33f726ff7e
commit fad308754b
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -57,7 +57,7 @@ target_compile_options(slsProjectWarnings INTERFACE
-Woverloaded-virtual -Woverloaded-virtual
-Wdouble-promotion -Wdouble-promotion
-Wformat=2 -Wformat=2
-Wshadow
) )
@ -66,6 +66,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.2) if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.2)
message(FATAL_ERROR "Clang version must be at least 3.2!") message(FATAL_ERROR "Clang version must be at least 3.2!")
endif() endif()
target_compile_options(slsProjectWarnings INTERFACE -Wshadow) #Clag does not warn on constructor
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8) if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
message(FATAL_ERROR "GCC version must be at least 4.8!") message(FATAL_ERROR "GCC version must be at least 4.8!")

6
python/CMakeLists.txt
View File

@ -1,11 +1,17 @@
add_subdirectory(pybind11) add_subdirectory(pybind11)
pybind11_add_module(_sls_detector src/main.cpp) pybind11_add_module(_sls_detector src/main.cpp)
target_link_libraries(_sls_detector PUBLIC target_link_libraries(_sls_detector PUBLIC
slsProjectOptions
slsProjectWarnings
slsDetectorShared slsDetectorShared
slsReceiverShared slsReceiverShared
slsSupportLib ) slsSupportLib )
set_target_properties(_sls_detector PROPERTIES set_target_properties(_sls_detector PROPERTIES
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
) )