diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 4fa910e000..356e983775 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -255,7 +255,7 @@ if(GLTF_SUPPORT OR CITYJSON_SUPPORT) set(SWIG_DEFINES ${SWIG_DEFINES} -DWITH_GLTF) endif() -# Add USD support to serializers +# Add USD support to serializers if(USD_SUPPORT) UNIFY_ENVVARS_AND_CACHE(USD_INCLUDE_DIR) UNIFY_ENVVARS_AND_CACHE(USD_LIBRARY_DIR) @@ -278,13 +278,13 @@ if(USD_SUPPORT) endif() set(USD_LIBRARIES - usd_usd + usd_usd usd_usdGeom - usd_usdShade - usd_usdLux - usd_vt - usd_sdf - usd_tf + usd_usdShade + usd_usdLux + usd_vt + usd_sdf + usd_tf usd_gf ) @@ -481,7 +481,7 @@ if(BUILD_IFCGEOM) if(OCCT_STATIC) find_package(Threads) - + if(WASM_BUILD) set(OPENCASCADE_LIBRARIES ${OPENCASCADE_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) else() @@ -493,7 +493,7 @@ if(BUILD_IFCGEOM) set(OPENCASCADE_LIBRARIES -Wl,--start-group ${OPENCASCADE_LIBRARIES} -Wl,--end-group ${CMAKE_THREAD_LIBS_INIT}) endif() endif() - + if(NOT APPLE AND NOT WIN32) set(OPENCASCADE_LIBRARIES ${OPENCASCADE_LIBRARIES} "rt") endif() @@ -885,7 +885,7 @@ if(BUILD_IFCGEOM) if(WASM_BUILD) set(IFCOPENSHELL_LIBRARIES ${IFCOPENSHELL_LIBRARIES} IfcGeom ${IFCGEOM_SCHEMA_LIBRARIES}) else() - set(IFCOPENSHELL_LIBRARIES ${IFCOPENSHELL_LIBRARIES} IfcGeom ${IFCGEOM_SCHEMA_LIBRARIES} IfcGeom ${IFCGEOM_SCHEMA_LIBRARIES}) + set(IFCOPENSHELL_LIBRARIES ${IFCOPENSHELL_LIBRARIES} IfcGeom ${IFCGEOM_SCHEMA_LIBRARIES} IfcGeom ${IFCGEOM_SCHEMA_LIBRARIES}) endif() endif() @@ -974,7 +974,7 @@ if(BUILD_IFCGEOM) file(GLOB IFCGEOM_H_FILES ../src/ifcgeom/kernels/${kernel}/*.h) file(GLOB IFCGEOM_CPP_FILES ../src/ifcgeom/kernels/${kernel}/*.cpp) set(IFCGEOM_FILES ${IFCGEOM_CPP_FILES} ${IFCGEOM_H_FILES}) - + add_library(geometry_kernel_${kernel} ${IFCGEOM_FILES}) set_property(TARGET geometry_kernel_${kernel} APPEND PROPERTY COMPILE_FLAGS "-DIFC_GEOM_EXPORTS") # needed? @@ -982,7 +982,7 @@ if(BUILD_IFCGEOM) # endif() target_link_libraries(geometry_kernel_${kernel} ${${KERNEL_UPPER}_LIBRARIES}) list(APPEND kernel_libraries geometry_kernel_${kernel}) - + if(${kernel} STREQUAL "cgal") set_property(TARGET geometry_kernel_${kernel} APPEND_STRING PROPERTY COMPILE_FLAGS " -DCGAL_HAS_THREADS") @@ -1002,7 +1002,7 @@ if(BUILD_IFCGEOM) file(GLOB IFCGEOM_H_FILES ../src/ifcgeom/mapping/*.h) file(GLOB IFCGEOM_CPP_FILES ../src/ifcgeom/mapping/*.cpp) set(IFCGEOM_FILES ${IFCGEOM_CPP_FILES} ${IFCGEOM_H_FILES} ${IFCGEOM_I_FILES}) - + add_library(geometry_mapping_ifc${schema} STATIC ${IFCGEOM_FILES}) set_target_properties(geometry_mapping_ifc${schema} PROPERTIES COMPILE_FLAGS "-DIFC_GEOM_EXPORTS -DIfcSchema=Ifc${schema}") target_link_libraries(geometry_mapping_ifc${schema} IfcParse) @@ -1041,7 +1041,7 @@ if(BUILD_CONVERT OR BUILD_IFCPYTHON) foreach(schema ${SCHEMA_VERSIONS}) add_library(Serializers_ifc${schema} STATIC ${SERIALIZERS_S_FILES}) set_target_properties(Serializers_ifc${schema} PROPERTIES COMPILE_FLAGS "-DIFC_GEOM_EXPORTS -DIfcSchema=Ifc${schema}") - + if(WASM_BUILD) target_link_libraries(Serializers_ifc${schema} ${HDF5_LIBRARIES}) else() @@ -1221,7 +1221,7 @@ if(BUILD_IFCMAX) endif() if(WITH_CGAL) - add_subdirectory(../src/svgfill svgfill) + add_subdirectory(../src/svgfill svgfill) endif() if(BUILD_QTVIEWER) diff --git a/cmake/utilities.cmake b/cmake/utilities.cmake index fe7c4fa20d..590c5e5c1d 100644 --- a/cmake/utilities.cmake +++ b/cmake/utilities.cmake @@ -121,4 +121,4 @@ function(files_for_ifc_version IFC_VERSION RESULT_NAME) ${IFC_PARSE_DIR}/Ifc${IFC_VERSION}.cpp PARENT_SCOPE ) -endfunction() \ No newline at end of file +endfunction() diff --git a/src/ifcwrap/CMakeLists.txt b/src/ifcwrap/CMakeLists.txt index befd8c9ba0..8ac37dba36 100644 --- a/src/ifcwrap/CMakeLists.txt +++ b/src/ifcwrap/CMakeLists.txt @@ -120,7 +120,7 @@ IF((PYTHONINTERP_FOUND AND NOT "${PYTHON_EXECUTABLE}" STREQUAL "") OR PYTHON_MOD IF("${python_package_dir}" STREQUAL "") MESSAGE(WARNING "Unable to locate Python site-package directory, unable to install the Python wrapper") ELSE() - FILE(GLOB_RECURSE sourcefiles + FILE(GLOB_RECURSE sourcefiles "${CMAKE_CURRENT_SOURCE_DIR}/../ifcopenshell-python/ifcopenshell/*" ) FOREACH(file ${sourcefiles}) diff --git a/src/qtviewer/CMakeLists.txt b/src/qtviewer/CMakeLists.txt index 0e83f1a386..978d5f116b 100644 --- a/src/qtviewer/CMakeLists.txt +++ b/src/qtviewer/CMakeLists.txt @@ -86,14 +86,14 @@ target_link_libraries(${targetName} ${IFCOPENSHELL_LIBRARIES} ${OPENCASCADE_LIBRARIES} ${OPENSCENEGRAPH_LIBRARIES} - Qt${QT_VERSION}::Core - Qt${QT_VERSION}::Gui - Qt${QT_VERSION}::OpenGL - Qt${QT_VERSION}::OpenGLWidgets + Qt${QT_VERSION}::Core + Qt${QT_VERSION}::Gui + Qt${QT_VERSION}::OpenGL + Qt${QT_VERSION}::OpenGLWidgets Qt${QT_VERSION}::Widgets ) -target_include_directories(${targetName} PUBLIC +target_include_directories(${targetName} PUBLIC ${QT_DIR}/include ${OPENSCENEGRAPH_INCLUDE_DIRS} )