mirror of
https://github.com/IfcOpenShell/IfcOpenShell.git
synced 2026-09-21 13:53:41 +00:00
cmake: fix uninitialized variables
`set(SWIG_DEFINES ${SWIG_DEFINES} -DIFOPSH_WITH_CGAL)` already occurs in main cmake, so this command is redundant in `FindCGAL.cmake`.
This commit is contained in:
@@ -257,6 +257,8 @@ foreach(option_flag IN LISTS option_flags)
|
|||||||
convert_env_var_to_bool("${option_flag}")
|
convert_env_var_to_bool("${option_flag}")
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
|
set(SWIG_DEFINES "")
|
||||||
|
|
||||||
if(WITH_CGAL)
|
if(WITH_CGAL)
|
||||||
find_package(CGAL REQUIRED)
|
find_package(CGAL REQUIRED)
|
||||||
set(SWIG_DEFINES ${SWIG_DEFINES} -DIFOPSH_WITH_CGAL)
|
set(SWIG_DEFINES ${SWIG_DEFINES} -DIFOPSH_WITH_CGAL)
|
||||||
@@ -342,7 +344,7 @@ endif()
|
|||||||
|
|
||||||
# Find Boost: On win32 the (hardcoded) default is to use static libraries and
|
# Find Boost: On win32 the (hardcoded) default is to use static libraries and
|
||||||
# runtime, when doing running conda-build we pick what conda prepared for us.
|
# runtime, when doing running conda-build we pick what conda prepared for us.
|
||||||
if(WIN32 AND("$ENV{CONDA_BUILD}" STREQUAL ""))
|
if(WIN32 AND NOT DEFINED ENV{CONDA_BUILD})
|
||||||
set(Boost_USE_STATIC_LIBS ON)
|
set(Boost_USE_STATIC_LIBS ON)
|
||||||
set(Boost_USE_STATIC_RUNTIME OFF)
|
set(Boost_USE_STATIC_RUNTIME OFF)
|
||||||
set(Boost_USE_MULTITHREADED ON)
|
set(Boost_USE_MULTITHREADED ON)
|
||||||
@@ -788,6 +790,7 @@ set(CPACK_PACKAGE_VERSION_PATCH "${PROJECT_VERSION_PATCH}")
|
|||||||
set(CPACK_GENERATOR "TGZ;DEB")
|
set(CPACK_GENERATOR "TGZ;DEB")
|
||||||
set(CPACK_SOURCE_GENERATOR "TGZ")
|
set(CPACK_SOURCE_GENERATOR "TGZ")
|
||||||
|
|
||||||
|
set(BOOST_DEPS "")
|
||||||
foreach(COMPONENT IN ITEMS ${BOOST_COMPONENTS})
|
foreach(COMPONENT IN ITEMS ${BOOST_COMPONENTS})
|
||||||
string(REPLACE "_" "-" COMP ${COMPONENT})
|
string(REPLACE "_" "-" COMP ${COMPONENT})
|
||||||
set(BOOST_DEPS "${BOOST_DEPS}, libboost-${COMP}-dev")
|
set(BOOST_DEPS "${BOOST_DEPS}, libboost-${COMP}-dev")
|
||||||
|
|||||||
@@ -62,5 +62,4 @@ endif()
|
|||||||
add_library(IFCOPENSHELL_CGAL INTERFACE)
|
add_library(IFCOPENSHELL_CGAL INTERFACE)
|
||||||
target_link_libraries(IFCOPENSHELL_CGAL INTERFACE CGAL::CGAL)
|
target_link_libraries(IFCOPENSHELL_CGAL INTERFACE CGAL::CGAL)
|
||||||
target_compile_definitions(IFCOPENSHELL_CGAL INTERFACE IFOPSH_WITH_CGAL)
|
target_compile_definitions(IFCOPENSHELL_CGAL INTERFACE IFOPSH_WITH_CGAL)
|
||||||
set(SWIG_DEFINES ${SWIG_DEFINES} -DIFOPSH_WITH_CGAL)
|
|
||||||
install(TARGETS IFCOPENSHELL_CGAL EXPORT ${IFCOPENSHELL_EXPORT_TARGETS})
|
install(TARGETS IFCOPENSHELL_CGAL EXPORT ${IFCOPENSHELL_EXPORT_TARGETS})
|
||||||
|
|||||||
Reference in New Issue
Block a user