Skip to content

Feat cmake repair #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anmayithap merged 3 commits into from
Feb 10, 2025
Merged

Feat cmake repair #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bcab5ed
add dummy test case to build test project target
VsevolodChaplanov Feb 10, 2025
473e231
Merge branch 'master' into feat-cmake-repair
VsevolodChaplanov Feb 10, 2025
fa24621
remove user specific presets
VsevolodChaplanov Feb 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions cmake/install-config.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
@PACKAGE_INIT@

find_dependency(fmt REQUIRED)
find_dependency(pasio-utility REQUIRED)
find_dependency(pasio-core REQUIRED)
find_package(Python REQUIRED)
find_dependency(pybind11 REQUIRED)
find_dependency(Boost REQUIRED)

include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
check_required_components(@PROJECT_NAME@)
5 changes: 1 addition & 4 deletions conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@ def fmt():
return ["fmt::fmt"]

project_components = [
{
"target": "utility",
},
{
"target": "core",
"lib": "core",
Expand Down Expand Up @@ -72,7 +69,7 @@ def set_version(self):
def requirements(self):
self.requires("boost/1.86.0")
self.requires("pybind11/2.13.6")
self.test_requires("catch2/3.5.3")
self.test_requires("catch2/3.8.0")

def config_options(self):
if self.settings.os == "Windows":
Expand Down
2 changes: 1 addition & 1 deletion core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ target_configure_linker(${PROJECT_NAME})

# ---- Collect all sources for static analysis

set(ALL_SOURCE_FILES ${LIBRARY_INCLUDES})
set(ALL_SOURCE_FILES ${LIBRARY_INCLUDES} ${LIBRARY_SOURCES})

# ---- Clang-tidy target

Expand Down
5 changes: 3 additions & 2 deletions core/cmake/install-config.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@

include(CMakeFindDependencyMacro)

find_dependency(fmt REQUIRED)
find_dependency(pasio-utility REQUIRED)
find_package(Python REQUIRED)
find_dependency(Boost REQUIRED)
find_dependency(Pybind11 REQUIRED)

include(${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake)
check_required_components(@PROJECT_NAME@)
Loading