Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Remove LDFLAGS and GH_PROJECT - Add some CMAKE options for avoid compile EXAMPLES files and doxigen detection - Fix build of libhal_shared. Now it is build like shared library - Fix .pc file installation path Reported by: diizzy
- Loading branch information
Showing
4 changed files
with
28 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
--- hal/CMakeLists.txt.orig 2024-02-18 21:09:38 UTC | ||
+++ hal/CMakeLists.txt | ||
@@ -149,7 +149,7 @@ endif(WITH_MBEDTLS) | ||
|
||
add_library (hal STATIC ${libhal_SRCS}) | ||
|
||
-add_library (hal-shared STATIC ${libhal_SRCS}) | ||
+add_library (hal-shared SHARED ${libhal_SRCS}) | ||
|
||
target_compile_definitions(hal-shared PRIVATE EXPORT_FUNCTIONS_FOR_DLL) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
--- src/CMakeLists.txt.orig 2024-02-18 21:10:14 UTC | ||
+++ src/CMakeLists.txt | ||
@@ -367,7 +367,7 @@ if(UNIX) | ||
${CMAKE_CURRENT_LIST_DIR}/libiec61850.pc.in | ||
${CMAKE_CURRENT_BINARY_DIR}/libiec61850.pc @ONLY | ||
) | ||
- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libiec61850.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/pkgconfig") | ||
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libiec61850.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig") | ||
endif() | ||
|
||
install (TARGETS iec61850 iec61850-shared |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters