Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-08-06 07:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmake - fix uninitialized vars

Browse Source
This commit is contained in:
Andrej730
2025-12-05 14:29:48 +05:00
parent 225039aa96
commit c2a03eb658
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/CMakeLists.txt
+6 -2
View File
@@ -146,6 +146,9 @@ if(CCACHE_FOUND)
endif() endif()
endif() endif()
# Variable to accumulate swig definitions from various submodules.
set(SWIG_DEFINES "")
if(MSVC AND MSVC_PARALLEL_BUILD) if(MSVC AND MSVC_PARALLEL_BUILD)
add_definitions("/MP") add_definitions("/MP")
endif() endif()
@@ -275,7 +278,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)
@@ -445,7 +448,7 @@ else()
endif() endif()
endif(MSVC) endif(MSVC)
include_directories(${INCLUDE_DIRECTORIES} ${OPENCOLLADA_INCLUDE_DIRS} include_directories(${OPENCOLLADA_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS} ${JSON_INCLUDE_DIR} ${HDF5_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${JSON_INCLUDE_DIR} ${HDF5_INCLUDE_DIR}
${USD_INCLUDE_DIR} ${USD_INCLUDE_DIR}
${TBB_INCLUDE_DIR} ${TBB_INCLUDE_DIR}
@@ -675,6 +678,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")
cmake/FindHDF5.cmake
+3 -3
View File
@@ -19,13 +19,13 @@ UNIFY_ENVVARS_AND_CACHE(HDF5_LIBRARIES)
# To avoid cyclic calls to this file # To avoid cyclic calls to this file
list(REMOVE_ITEM CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}) list(REMOVE_ITEM CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR})
if("${HDF5_INCLUDE_DIR}" STREQUAL "") if(NOT HDF5_INCLUDE_DIR)
message(STATUS "No HDF5 include directory specified") message(STATUS "No HDF5 include directory specified")
else() else()
set(HDF5_INCLUDE_DIR "${HDF5_INCLUDE_DIR}" CACHE FILEPATH "HDF5 header files") set(HDF5_INCLUDE_DIR "${HDF5_INCLUDE_DIR}" CACHE FILEPATH "HDF5 header files")
endif() endif()
if("${HDF5_LIBRARY_DIR}" STREQUAL "") if(NOT HDF5_LIBRARY_DIR)
message(STATUS "No HDF5 library directory specified") message(STATUS "No HDF5 library directory specified")
else() else()
set(HDF5_LIBRARY_DIR "${HDF5_LIBRARY_DIR}" CACHE FILEPATH "HDF5 library files") set(HDF5_LIBRARY_DIR "${HDF5_LIBRARY_DIR}" CACHE FILEPATH "HDF5 library files")
@@ -35,7 +35,7 @@ if(HDF5_LIBRARY_DIR)
# result of the HDF5 ctest package # result of the HDF5 ctest package
# Find zlib using cmake find_library. How should this be implemented? # Find zlib using cmake find_library. How should this be implemented?
# FIND_LIBRARY(NAMES z libz libz_debug PATHS ... NO_DEFAULT_PATH) # FIND_LIBRARY(NAMES z libz libz_debug PATHS ... NO_DEFAULT_PATH)
if("$ENV{CONDA_BUILD}" STREQUAL "") if(NOT DEFINED ENV{CONDA_BUILD})
# result of the HDF5 ctest package # result of the HDF5 ctest package
if(WIN32) if(WIN32)
set(zlib_post lib) set(zlib_post lib)
src/svgfill/CMakeLists.txt
+1 -1
View File
@@ -23,7 +23,7 @@ if(NOT IS_ABSOLUTE ${INCLUDEDIR})
endif() endif()
message(STATUS "INCLUDEDIR: ${INCLUDEDIR}") message(STATUS "INCLUDEDIR: ${INCLUDEDIR}")
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_MULTITHREADED ON) set(Boost_USE_MULTITHREADED ON)
if (USE_STATIC_MSVC_RUNTIME) if (USE_STATIC_MSVC_RUNTIME)