rexy712/rjp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Supply correct lib flags for static/shared build

Browse Source
This commit is contained in:
rexy712 2020-03-08 19:10:01 -07:00
parent 91f810e404
commit 637f20e6b7
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -8,6 +8,8 @@ set(rjp_VERSION_REVISION 0)
set(INCLUDE_PATH ${CMAKE_SOURCE_DIR}/include) set(INCLUDE_PATH ${CMAKE_SOURCE_DIR}/include)
include_directories("${INCLUDE_PATH}") include_directories("${INCLUDE_PATH}")
set(RJP_LIBFLAGS "-lrjp")
configure_file( configure_file(
"${INCLUDE_PATH}/config.h.in" "${INCLUDE_PATH}/config.h.in"
"${INCLUDE_PATH}/config.h" "${INCLUDE_PATH}/config.h"

2
pc/rjp.pc.cmake.in
View File

@ -5,5 +5,5 @@ Name: rjp
Description: Rexy's JSON Parser Description: Rexy's JSON Parser
URL: https://gitlab.com/rexy712/rjp URL: https://gitlab.com/rexy712/rjp
Version: @rjp_VERSION_MAJOR@.@rjp_VERSION_MINOR@.@rjp_VERSION_REVISION@ Version: @rjp_VERSION_MAJOR@.@rjp_VERSION_MINOR@.@rjp_VERSION_REVISION@
Libs: -L${libdir} -lrjp Libs: -L${libdir} @RJP_LIBFLAGS@
Cflags: -I${includedir} Cflags: -I${includedir}

3
rjp++/CMakeLists.txt
View File

@ -10,11 +10,14 @@ include_directories("${INCLUDE_PATH}")
option(ENABLE_SHARED "Build shared library" OFF) option(ENABLE_SHARED "Build shared library" OFF)
set(SOURCE_LIST "src/allocator.cpp" "src/array.cpp" "src/integral.cpp" "src/object.cpp" "src/rjp.cpp" "src/string.cpp" "src/string_val.cpp" "src/value.cpp") set(SOURCE_LIST "src/allocator.cpp" "src/array.cpp" "src/integral.cpp" "src/object.cpp" "src/rjp.cpp" "src/string.cpp" "src/string_val.cpp" "src/value.cpp")
if(ENABLE_SHARED) if(ENABLE_SHARED)
set(RJP++_LIBFLAGS "-lrjp++")
add_library(rjp++ SHARED ${SOURCE_LIST}) add_library(rjp++ SHARED ${SOURCE_LIST})
set_target_properties(rjp++ PROPERTIES SOVERSION "${rjp_VERSION_MAJOR}.${rjp_VERSION_MINOR}.${rjp_VERSION_REVISION}") set_target_properties(rjp++ PROPERTIES SOVERSION "${rjp_VERSION_MAJOR}.${rjp_VERSION_MINOR}.${rjp_VERSION_REVISION}")
else() else()
set(RJP++_LIBFLAGS "-lrjp++ -lrjp -lrexy")
add_library(rjp++ STATIC ${SOURCE_LIST}) add_library(rjp++ STATIC ${SOURCE_LIST})
endif() endif()

2
rjp++/pc/rjp++.pc.cmake.in
View File

@ -5,5 +5,5 @@ Name: rjp++
Description: C++ wrapper around rjp Description: C++ wrapper around rjp
URL: https://gitlab.com/rexy712/rjp URL: https://gitlab.com/rexy712/rjp
Version: @rjp++_VERSION_MAJOR@.@rjp++_VERSION_MINOR@.@rjp++_VERSION_REVISION@ Version: @rjp++_VERSION_MAJOR@.@rjp++_VERSION_MINOR@.@rjp++_VERSION_REVISION@
Libs: -L${libdir} -lrjp++ Libs: -L${libdir} @RJP++_LIBFLAGS@
Cflags: -I${includedir} Cflags: -I${includedir}