Skip to content

Commit 16728b0

Browse files
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent 9185a5b commit 16728b0

File tree

4 files changed

+30
-40
lines changed

4 files changed

+30
-40
lines changed

CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ if(WIN32)
2323
else()
2424
set(USE_FORTRAN_SUBDIRECTORY_DEFAULT OFF)
2525
endif()
26-
option(USE_FORTRAN_SUBDIRECTORY "Use cmake to generate sub project for fortran parts"
27-
${USE_FORTRAN_SUBDIRECTORY_DEFAULT}
28-
)
26+
option(USE_FORTRAN_SUBDIRECTORY
27+
"Use cmake to generate sub project for fortran parts"
28+
${USE_FORTRAN_SUBDIRECTORY_DEFAULT})
2929
option(DISABLE_TESTS "Disable unit tests." OFF)
3030

3131
find_package(Eigen3 QUIET NO_CMAKE_PACKAGE_REGISTRY)
@@ -45,7 +45,7 @@ if(MSVC)
4545
endif()
4646
endif(MSVC)
4747

48-
# ######################################################################################
48+
# ##############################################################################
4949

5050
add_subdirectory(src)
5151

src/CMakeLists.txt

+20-27
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@ endif()
77
set(SOURCES QuadProg.cpp)
88
set(HEADERS eigen_quadprog_api.h QuadProg.h)
99

10-
set(QUAD_FORT QuadProg/f/solve.QP.f QuadProg/f/solve.QP.compact.f QuadProg/f/util.f)
11-
set(QUAD_C QuadProg/c/solve.QP.c QuadProg/c/solve.QP.compact.c QuadProg/c/util.c)
10+
set(QUAD_FORT QuadProg/f/solve.QP.f QuadProg/f/solve.QP.compact.f
11+
QuadProg/f/util.f)
12+
set(QUAD_C QuadProg/c/solve.QP.c QuadProg/c/solve.QP.compact.c
13+
QuadProg/c/util.c)
1214

1315
set(BLAS_FORT BLAS/f/blas.f)
1416
set(BLAS_C BLAS/c/blas.c)
@@ -22,19 +24,17 @@ endif()
2224
add_library(${PROJECT_NAME} SHARED ${SOURCES} ${HEADERS})
2325
target_include_directories(
2426
${PROJECT_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
25-
$<INSTALL_INTERFACE:include>
26-
)
27+
$<INSTALL_INTERFACE:include>)
2728
set_target_properties(
28-
${PROJECT_NAME} PROPERTIES SOVERSION ${PROJECT_VERSION_MAJOR} VERSION
29-
${PROJECT_VERSION}
30-
)
31-
set_target_properties(
32-
${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "-DEIGEN_QUADPROG_EXPORT"
33-
)
29+
${PROJECT_NAME} PROPERTIES SOVERSION ${PROJECT_VERSION_MAJOR}
30+
VERSION ${PROJECT_VERSION})
31+
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS
32+
"-DEIGEN_QUADPROG_EXPORT")
3433
if(TARGET Eigen3::Eigen)
3534
target_link_libraries(${PROJECT_NAME} PUBLIC Eigen3::Eigen)
3635
else()
37-
target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC "${EIGEN3_INCLUDE_DIR}")
36+
target_include_directories(${PROJECT_NAME} SYSTEM
37+
PUBLIC "${EIGEN3_INCLUDE_DIR}")
3838
endif()
3939

4040
if(${USE_FORTRAN_SUBDIRECTORY})
@@ -46,23 +46,20 @@ if(${USE_FORTRAN_SUBDIRECTORY})
4646
RUNTIME_DIR quadprog_fortran # .dll location relative to root binary tree
4747
LIBRARIES quadprog_fortran # target libraries created
4848
LINK_LIBRARIES # link interface libraries
49-
NO_EXTERNAL_INSTALL
50-
)
49+
NO_EXTERNAL_INSTALL)
5150
set(quadprog_fortran_SHARED_LIBRARY
5251
${CMAKE_CURRENT_BINARY_DIR}/quadprog_fortran/libquadprog_fortran${CMAKE_SHARED_LIBRARY_SUFFIX}
5352
)
5453
set(quadprog_fortran_STATIC_LIBRARY
5554
${CMAKE_CURRENT_BINARY_DIR}/quadprog_fortran/libquadprog_fortran${CMAKE_STATIC_LIBRARY_SUFFIX}
5655
)
57-
# Required here because qld_fortran is external to this project and install does not
58-
# run
56+
# Required here because qld_fortran is external to this project and install
57+
# does not run
5958
if(WIN32)
6059
install(FILES ${quadprog_fortran_SHARED_LIBRARY}
61-
DESTINATION ${CMAKE_INSTALL_BINDIR}
62-
)
60+
DESTINATION ${CMAKE_INSTALL_BINDIR})
6361
install(FILES ${quadprog_fortran_STATIC_LIBRARY}
64-
DESTINATION ${CMAKE_INSTALL_LIBDIR}
65-
)
62+
DESTINATION ${CMAKE_INSTALL_LIBDIR})
6663
set(PACKAGE_EXTRA_MACROS
6764
"
6865
get_filename_component(PACKAGE_PREFIX_DIR \"\${CMAKE_CURRENT_LIST_DIR}/../../../\" ABSOLUTE)
@@ -73,8 +70,7 @@ if(NOT TARGET quadprog_fortran)
7370
)
7471
endif()
7572
"
76-
PARENT_SCOPE
77-
)
73+
PARENT_SCOPE)
7874
endif()
7975
target_link_libraries(${PROJECT_NAME} PUBLIC quadprog_fortran)
8076
endif()
@@ -88,18 +84,15 @@ if(${USE_F2C})
8884
include(\"\${CMAKE_CURRENT_LIST_DIR}/find_eigen_quadprog_f2c.cmake\")
8985
find_eigen_quadprog_f2c()
9086
"
91-
PARENT_SCOPE
92-
)
87+
PARENT_SCOPE)
9388
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/find_eigen_quadprog_f2c.cmake"
94-
DESTINATION "${CONFIG_INSTALL_DIR}"
95-
)
89+
DESTINATION "${CONFIG_INSTALL_DIR}")
9690
endif()
9791

9892
install(
9993
TARGETS ${PROJECT_NAME}
10094
EXPORT "${TARGETS_EXPORT_NAME}"
10195
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
10296
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
103-
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
104-
)
97+
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
10598
install(FILES ${HEADERS} DESTINATION ${INCLUDE_INSTALL_DESTINATION})

src/find_eigen_quadprog_f2c.cmake

+5-7
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,21 @@ function(find_eigen_quadprog_f2c)
99
find_path(
1010
F2C_INCLUDE_DIR
1111
NAMES f2c.h
12-
HINTS ${F2C_PREFIX}
13-
)
12+
HINTS ${F2C_PREFIX})
1413

1514
find_library(
1615
F2C_LIBRARY
1716
NAMES f2c
18-
PATHS ${F2C_PREFIX}
19-
)
17+
PATHS ${F2C_PREFIX})
2018

2119
include(FindPackageHandleStandardArgs)
2220
find_package_handle_standard_args(F2C DEFAULT_MSG F2C_LIBRARY F2C_INCLUDE_DIR)
2321
mark_as_advanced(F2C_INCLUDE_DIR F2C_LIBRARY)
2422
if(F2C_FOUND)
2523
add_library(eigen-quadprog::f2c INTERFACE IMPORTED GLOBAL)
2624
set_target_properties(
27-
eigen-quadprog::f2c PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${F2C_INCLUDE_DIR}
28-
INTERFACE_LINK_LIBRARIES ${F2C_LIBRARY}
29-
)
25+
eigen-quadprog::f2c
26+
PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${F2C_INCLUDE_DIR}
27+
INTERFACE_LINK_LIBRARIES ${F2C_LIBRARY})
3028
endif()
3129
endfunction()

src/quadprog_fortran/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
project(quadprog_fortran Fortran)
22

33
set(QUAD_FORT ../QuadProg/f/solve.QP.f ../QuadProg/f/solve.QP.compact.f
4-
../QuadProg/f/util.f
5-
)
4+
../QuadProg/f/util.f)
65

76
set(BLAS_FORT ../BLAS/f/blas.f)
87

0 commit comments

Comments
 (0)