Skip to content
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.

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

Cura 8640 PyQt6 upgrade #3

Merged
merged 15 commits into from
Apr 14, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
link to libnest2d to nest2d
  • Loading branch information
jellespijker committed Nov 17, 2021
commit b2c3c65dec36317ee3994e8d96eb8f77cbc7597b
3 changes: 1 addition & 2 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@


class libnest2dConan(ConanFile):
name = "nest2d"
name = "libnest2d"
version = "4.13.0-alpha+001"
license = "LGPL-3.0"
author = "Ultimaker B.V."
Expand Down Expand Up @@ -76,7 +76,6 @@ def validate(self):
def layout(self):
cmake_layout(self)
self.cpp.source.includedirs = ["include"]
self.cpp.package.libs = [f"nest2d_{self.options.geometries}_{self.options.optimizer}"]

def generate(self):
cmake = CMakeDeps(self)
Expand Down
6 changes: 3 additions & 3 deletions test_package/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ cmake_minimum_required(VERSION 3.13)

project(Libnest2D_example)
set(CMAKE_CXX_STANDARD 17)
find_package(nest2d REQUIRED)
find_package(libnest2d REQUIRED)

add_executable(test main.cpp)

target_link_libraries(test PRIVATE nest2d::nest2d)
target_include_directories(test PRIVATE ${nest2d_INCLUDE_DIRS})
target_link_libraries(test PRIVATE libnest2d::libnest2d)
target_include_directories(test PRIVATE ${libnest2d_INCLUDE_DIRS})