Skip to content

Commit dbb4e91

Browse files
committed
apply cmake file formatting
1 parent 44f0a4a commit dbb4e91

File tree

5 files changed

+38
-44
lines changed

5 files changed

+38
-44
lines changed

cmake/IfcOpenShellConfig.cmake.in

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,14 @@ include(CMakeFindDependencyMacro)
1313
set(Boost_USE_STATIC_LIBS ON)
1414
set(Boost_USE_STATIC_RUNTIME OFF)
1515
set(Boost_USE_MULTITHREADED ON)
16-
set(Boost_COMPONENTS system program_options regex thread date_time iostreams)
16+
set(Boost_COMPONENTS
17+
system
18+
program_options
19+
regex
20+
thread
21+
date_time
22+
iostreams
23+
)
1724
find_dependency(Boost CONFIG COMPONENTS ${Boost_COMPONENTS})
1825
find_dependency(Eigen3 CONFIG)
1926

@@ -39,7 +46,6 @@ if(IFCOPENSHELL_IFCXML)
3946
find_dependency(LibXml2 CONFIG)
4047
endif()
4148

42-
4349
if(IFCOPENSHELL_WITH_CGAL)
4450
find_dependency(CGAL CONFIG)
4551
endif()
@@ -48,9 +54,7 @@ if(IFCOPENSHELL_WITH_OPENCASCADE)
4854
find_dependency(OpenCASCADE CONFIG)
4955
if(OpenCASCADE_VERSION VERSION_LESS "7.7.0")
5056
# cmake configs < 7.7.0 were not adding include directories to targets automatically.
51-
set_target_properties(TKernel PROPERTIES
52-
INTERFACE_INCLUDE_DIRECTORIES "${OpenCASCADE_INCLUDE_DIR}"
53-
)
57+
set_target_properties(TKernel PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${OpenCASCADE_INCLUDE_DIR}")
5458
endif()
5559
endif()
5660

cmake/cmake_uninstall.cmake.in

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,13 @@ foreach(file ${files})
2929

3030
if(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
3131
exec_program(
32-
"@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
33-
OUTPUT_VARIABLE rm_out
34-
RETURN_VALUE rm_retval
32+
"@CMAKE_COMMAND@"
33+
ARGS
34+
"-E remove \"$ENV{DESTDIR}${file}\""
35+
OUTPUT_VARIABLE
36+
rm_out
37+
RETURN_VALUE
38+
rm_retval
3539
)
3640

3741
if(NOT "${rm_retval}" STREQUAL 0)

docs/cpp-api/CMakeLists.txt

Lines changed: 20 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,35 @@
11
#Look for an executable called sphinx-build
2-
find_program(SPHINX_EXECUTABLE
3-
NAMES sphinx-build
4-
DOC "Path to sphinx-build executable")
2+
find_program(SPHINX_EXECUTABLE NAMES sphinx-build DOC "Path to sphinx-build executable")
53

64
include(FindPackageHandleStandardArgs)
75

86
#Handle standard arguments to find_package like REQUIRED and QUIET
9-
find_package_handle_standard_args(Sphinx
10-
"Failed to find sphinx-build executable"
11-
SPHINX_EXECUTABLE)
7+
find_package_handle_standard_args(Sphinx "Failed to find sphinx-build executable" SPHINX_EXECUTABLE)
128

139
find_package(Doxygen REQUIRED)
1410
#find_package(Sphinx REQUIRED)
1511

1612
set(SPHINX_SOURCE ${CMAKE_CURRENT_SOURCE_DIR})
1713
set(SPHINX_BUILD ${CMAKE_CURRENT_BINARY_DIR}/docs/sphinx)
1814

19-
MESSAGE(STATUS "SPHINX BUILD ${CMAKE_CURRENT_BINARY_DIR}")
15+
message(STATUS "SPHINX BUILD ${CMAKE_CURRENT_BINARY_DIR}")
2016

2117
file(MAKE_DIRECTORY ./output/doxygen)
2218

23-
if (DOXYGEN_FOUND)
24-
25-
add_custom_target(Sphinx ALL
26-
COMMAND
27-
${SPHINX_EXECUTABLE} -v -T -b html
28-
${SPHINX_SOURCE} ${CMAKE_CURRENT_SOURCE_DIR}/output
29-
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/output
30-
COMMENT "Generating documentation with Sphinx")
31-
32-
# add_custom_target(ifcopenshell_python_docs ALL
33-
# COMMAND make html
34-
# WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../src/ifcblenderexport/docs
35-
# OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/../src/ifcblenderexport/docs
36-
# COMMENT "Generating documentation with Sphinx")
37-
38-
else (DOXYGEN_FOUND)
39-
message("Doxygen need to be installed to generate the doxygen documentation")
40-
endif (DOXYGEN_FOUND)
19+
if(DOXYGEN_FOUND)
20+
add_custom_target(
21+
Sphinx
22+
ALL
23+
COMMAND ${SPHINX_EXECUTABLE} -v -T -b html ${SPHINX_SOURCE} ${CMAKE_CURRENT_SOURCE_DIR}/output
24+
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/output
25+
COMMENT "Generating documentation with Sphinx"
26+
)
27+
28+
# add_custom_target(ifcopenshell_python_docs ALL
29+
# COMMAND make html
30+
# WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../src/ifcblenderexport/docs
31+
# OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/../src/ifcblenderexport/docs
32+
# COMMENT "Generating documentation with Sphinx")
33+
else(DOXYGEN_FOUND)
34+
message("Doxygen need to be installed to generate the doxygen documentation")
35+
endif(DOXYGEN_FOUND)

src/ifcgeom/CMakeLists.txt

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,7 @@ endif()
2929

3030
find_package(Eigen3 REQUIRED)
3131

32-
target_link_libraries(
33-
IfcGeom
34-
${mapping_libraries}
35-
${CMAKE_THREAD_LIBS_INIT}
36-
"Eigen3::Eigen"
37-
${CGAL_LIBRARIES}
38-
)
32+
target_link_libraries(IfcGeom ${mapping_libraries} ${CMAKE_THREAD_LIBS_INIT} "Eigen3::Eigen" ${CGAL_LIBRARIES})
3933

4034
if(WITH_OPENCASCADE)
4135
target_link_libraries(IfcGeom TKernel)

src/ifcgeom/kernels/CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,4 @@ endforeach()
4343

4444
set(kernel_libraries ${kernel_libraries} PARENT_SCOPE)
4545

46-
install(
47-
FILES ifc_geomlibrary_api.h
48-
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/ifcgeom/kernels/"
49-
)
46+
install(FILES ifc_geomlibrary_api.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/ifcgeom/kernels/")

0 commit comments

Comments
 (0)