diff --git a/CMakeLists.txt b/CMakeLists.txt index 75e7465..0cbfb35 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,6 +8,8 @@ set(rjp_VERSION_REVISION 0) set(INCLUDE_PATH ${CMAKE_SOURCE_DIR}/include) include_directories("${INCLUDE_PATH}") +set(RJP_LIBFLAGS "-lrjp") + configure_file( "${INCLUDE_PATH}/config.h.in" "${INCLUDE_PATH}/config.h" diff --git a/pc/rjp.pc.cmake.in b/pc/rjp.pc.cmake.in index cd47fcd..98e2ead 100644 --- a/pc/rjp.pc.cmake.in +++ b/pc/rjp.pc.cmake.in @@ -5,5 +5,5 @@ Name: rjp Description: Rexy's JSON Parser URL: https://gitlab.com/rexy712/rjp Version: @rjp_VERSION_MAJOR@.@rjp_VERSION_MINOR@.@rjp_VERSION_REVISION@ -Libs: -L${libdir} -lrjp +Libs: -L${libdir} @RJP_LIBFLAGS@ Cflags: -I${includedir} diff --git a/rjp++/CMakeLists.txt b/rjp++/CMakeLists.txt index 75e5310..cd39206 100644 --- a/rjp++/CMakeLists.txt +++ b/rjp++/CMakeLists.txt @@ -10,11 +10,14 @@ include_directories("${INCLUDE_PATH}") 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") if(ENABLE_SHARED) + set(RJP++_LIBFLAGS "-lrjp++") add_library(rjp++ SHARED ${SOURCE_LIST}) set_target_properties(rjp++ PROPERTIES SOVERSION "${rjp_VERSION_MAJOR}.${rjp_VERSION_MINOR}.${rjp_VERSION_REVISION}") else() + set(RJP++_LIBFLAGS "-lrjp++ -lrjp -lrexy") add_library(rjp++ STATIC ${SOURCE_LIST}) endif() diff --git a/rjp++/pc/rjp++.pc.cmake.in b/rjp++/pc/rjp++.pc.cmake.in index 37e084b..2227872 100644 --- a/rjp++/pc/rjp++.pc.cmake.in +++ b/rjp++/pc/rjp++.pc.cmake.in @@ -5,5 +5,5 @@ Name: rjp++ Description: C++ wrapper around rjp URL: https://gitlab.com/rexy712/rjp Version: @rjp++_VERSION_MAJOR@.@rjp++_VERSION_MINOR@.@rjp++_VERSION_REVISION@ -Libs: -L${libdir} -lrjp++ +Libs: -L${libdir} @RJP++_LIBFLAGS@ Cflags: -I${includedir}