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.

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

Fix installation problems #201

Merged
merged 4 commits into from
Nov 21, 2023
Merged

Fix installation problems #201

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
343e523
fix missing hs_version.h header (closes #198)
gliwka Nov 20, 2023
d611fcb
fix missing installation of static libs
markos Nov 20, 2023
c3a6bb3
Merge pull request #199 from gliwka/fix-missing-hs-version-header
markos Nov 21, 2023
44b893a
Merge pull request #200 from VectorCamp/bugfix/install-static-libs
markos Nov 21, 2023
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
5 changes: 3 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CXX_FLAGS}")
endif()

SET(hs_HEADERS
${PROJECT_BINARY_DIR}/hs_version.h
src/hs.h
src/hs_common.h
src/hs_compile.h
Expand Down Expand Up @@ -1118,7 +1119,7 @@ else ()
endif (ARCH_AARCH64)
endif (NOT FAT_RUNTIME)

if (NOT BUILD_SHARED_LIBS)
if (BUILD_STATIC_LIBS)
install(TARGETS hs_runtime DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif()

Expand Down Expand Up @@ -1150,7 +1151,7 @@ if (BUILD_STATIC_LIBS)
add_dependencies(hs ragel_Parser)
endif ()

if (NOT BUILD_SHARED_LIBS)
if (BUILD_STATIC_LIBS)
install(TARGETS hs DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif()

Expand Down