Commit 66852f79 authored by Deepak Rangarajan's avatar Deepak Rangarajan Committed by Jordan Musser
Browse files

fix cmake installation

parent 20a6dd94

.spack/repo/packages/csg-eb/package.py

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ class CsgEb(CMakePackage): 


    depends_on("pegtl")

    depends_on("catch2")

    depends_on("cgal", when="+cgal")

    depends_on("cgal header_only=True", when="+cgal")



    def cmake_args(self):

        return [

CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ install(TARGETS csg-eb 
    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}

    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

)

export(TARGETS csg-eb

export(TARGETS csg-eb csg-eb-pi

    NAMESPACE CsgEb::

    FILE "${CMAKE_CURRENT_BINARY_DIR}/CsgEbConfig.cmake"

)

Dockerfile

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ RUN apt-get -qq update \ 
  && apt-get -qq -y install --no-install-recommends \

  build-essential=12.* \

  git=1:2.* \

  file=1:5.* \

  openscad=2019.* \

  pkg-config=0.29.* \

  python3-pip=20.* \

src/csg/CMakeLists.txt

+9 −4
Original line number Diff line number Diff line
@@ -19,17 +19,22 @@ if (CSG_CGAL_ENABLED) 
   )

endif()



add_library(csg-eb ${csg-eb_SOURCES})

add_library(CsgEb::csg-eb ALIAS csg-eb)

## Create a private interface library

add_library(csg-eb-pi INTERFACE)



target_link_libraries(csg-eb PRIVATE

target_link_libraries(csg-eb-pi INTERFACE

                      stdc++fs

                      taocpp::pegtl

                      )

if (CSG_CGAL_ENABLED)

   target_link_libraries(csg-eb PRIVATE CGAL::CGAL)

   target_link_libraries(csg-eb-pi INTERFACE CGAL::CGAL)

endif()



# Create a static library

add_library(csg-eb ${csg-eb_SOURCES})

add_library(CsgEb::csg-eb ALIAS csg-eb)

target_link_libraries(csg-eb PRIVATE "$<BUILD_INTERFACE:csg-eb-pi>")



if (BUILD_TESTING)

   add_subdirectory(tests)

endif()