Skip to content

Commit 8844895

Browse files
committed
Get rid of nomp.pc.in
Also, minor refactoring in CMakeLists.txt.
1 parent 8d69a25 commit 8844895

File tree

2 files changed

+11
-22
lines changed

2 files changed

+11
-22
lines changed

CMakeLists.txt

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,6 @@ target_link_libraries(nomp PRIVATE OpenSSL::SSL)
7575
find_package(SymEngine REQUIRED HINTS $ENV{CONDA_PREFIX})
7676
target_include_directories(nomp PRIVATE ${SYMENGINE_INCLUDE_DIRS})
7777
target_link_libraries(nomp PRIVATE ${SYMENGINE_LIBRARIES})
78-
target_compile_options(nomp PRIVATE $<$<CXX_COMPILER_ID:MSVC>:/W4 /WX>
79-
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -Wpedantic>)
8078

8179
if (ENABLE_OPENCL)
8280
target_link_libraries(nomp PRIVATE OpenCL::OpenCL)
@@ -103,6 +101,8 @@ set_target_properties(nomp PROPERTIES
103101
VERSION ${PROJECT_VERSION}
104102
SOVERSION 1
105103
PUBLIC_HEADER include/nomp.h)
104+
target_compile_options(nomp PRIVATE $<$<CXX_COMPILER_ID:MSVC>:/W4 /WX>
105+
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -Wpedantic>)
106106
target_include_directories(nomp PRIVATE include)
107107

108108
if (ENABLE_DOCS)
@@ -121,17 +121,18 @@ foreach(test ${TESTS})
121121
install (TARGETS ${test_exe} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/tests)
122122
endforeach(test ${TESTS})
123123

124-
install(TARGETS nomp LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
124+
install(TARGETS nomp
125+
LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
125126
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
126-
install(DIRECTORY ${CMAKE_SOURCE_DIR}/python DESTINATION ${CMAKE_INSTALL_PREFIX})
127127

128-
install(DIRECTORY tests/ DESTINATION ${CMAKE_INSTALL_PREFIX}/tests
128+
install(DIRECTORY ${CMAKE_SOURCE_DIR}/python
129+
DESTINATION ${CMAKE_INSTALL_PREFIX})
130+
131+
install(DIRECTORY tests/
132+
DESTINATION ${CMAKE_INSTALL_PREFIX}/tests
129133
FILES_MATCHING PATTERN "*.py")
130134

131135
install(DIRECTORY scripts/ DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
132-
FILE_PERMISSIONS OWNER_READ OWNER_EXECUTE OWNER_WRITE GROUP_READ GROUP_EXECUTE
136+
FILE_PERMISSIONS OWNER_READ OWNER_EXECUTE OWNER_WRITE
137+
GROUP_READ GROUP_EXECUTE
133138
WORLD_READ WORLD_EXECUTE)
134-
135-
configure_file(nomp.pc.in nomp.pc @ONLY)
136-
install(FILES ${CMAKE_BINARY_DIR}/nomp.pc
137-
DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)

nomp.pc.in

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)