Commit b0f26966 authored by Joseph Noir's avatar Joseph Noir

Update LDFLAGS and LD_FLAGS to new name

parent 8f0085f2
...@@ -134,7 +134,7 @@ add_custom_target(libcaf_core) ...@@ -134,7 +134,7 @@ add_custom_target(libcaf_core)
# build shared library if not compiling static only # build shared library if not compiling static only
if (NOT CAF_BUILD_STATIC_ONLY) if (NOT CAF_BUILD_STATIC_ONLY)
add_library(libcaf_core_shared SHARED ${LIBCAF_CORE_SRCS} ${LIBCAF_CORE_HDRS}) add_library(libcaf_core_shared SHARED ${LIBCAF_CORE_SRCS} ${LIBCAF_CORE_HDRS})
target_link_libraries(libcaf_core_shared ${LD_FLAGS}) target_link_libraries(libcaf_core_shared ${CAF_EXTRA_LDFLAGS})
set_target_properties(libcaf_core_shared set_target_properties(libcaf_core_shared
PROPERTIES PROPERTIES
SOVERSION ${CAF_VERSION} SOVERSION ${CAF_VERSION}
...@@ -151,7 +151,7 @@ endif () ...@@ -151,7 +151,7 @@ endif ()
# build static library only if --build-static or --build-static-only was set # build static library only if --build-static or --build-static-only was set
if (CAF_BUILD_STATIC_ONLY OR CAF_BUILD_STATIC) if (CAF_BUILD_STATIC_ONLY OR CAF_BUILD_STATIC)
add_library(libcaf_core_static STATIC ${LIBCAF_CORE_HDRS} ${LIBCAF_CORE_SRCS}) add_library(libcaf_core_static STATIC ${LIBCAF_CORE_HDRS} ${LIBCAF_CORE_SRCS})
target_link_libraries(libcaf_core_static ${LD_FLAGS}) target_link_libraries(libcaf_core_static ${CAF_EXTRA_LDFLAGS})
set_target_properties(libcaf_core_static PROPERTIES OUTPUT_NAME caf_core_static) set_target_properties(libcaf_core_static PROPERTIES OUTPUT_NAME caf_core_static)
install(TARGETS libcaf_core_static ARCHIVE DESTINATION lib) install(TARGETS libcaf_core_static ARCHIVE DESTINATION lib)
add_dependencies(libcaf_core_static libcaf_core) add_dependencies(libcaf_core_static libcaf_core)
......
...@@ -42,7 +42,7 @@ add_custom_target(libcaf_io) ...@@ -42,7 +42,7 @@ add_custom_target(libcaf_io)
# build shared library if not compiling static only # build shared library if not compiling static only
if (NOT CAF_BUILD_STATIC_ONLY) if (NOT CAF_BUILD_STATIC_ONLY)
add_library(libcaf_io_shared SHARED ${LIBCAF_IO_SRCS} ${LIBCAF_IO_HDRS}) add_library(libcaf_io_shared SHARED ${LIBCAF_IO_SRCS} ${LIBCAF_IO_HDRS})
target_link_libraries(libcaf_io_shared ${LDFLAGS} ${CAF_LIBRARY_CORE}) target_link_libraries(libcaf_io_shared ${CAF_EXTRA_LDFLAGS} ${CAF_LIBRARY_CORE})
set_target_properties(libcaf_io_shared set_target_properties(libcaf_io_shared
PROPERTIES PROPERTIES
SOVERSION ${CAF_VERSION} SOVERSION ${CAF_VERSION}
...@@ -59,7 +59,7 @@ endif () ...@@ -59,7 +59,7 @@ endif ()
# build static library only if --build-static or --build-static-only was set # build static library only if --build-static or --build-static-only was set
if (CAF_BUILD_STATIC_ONLY OR CAF_BUILD_STATIC) if (CAF_BUILD_STATIC_ONLY OR CAF_BUILD_STATIC)
add_library(libcaf_io_static STATIC ${LIBCAF_IO_HDRS} ${LIBCAF_IO_SRCS}) add_library(libcaf_io_static STATIC ${LIBCAF_IO_HDRS} ${LIBCAF_IO_SRCS})
target_link_libraries(libcaf_io_static ${LDFLAGS} ${CAF_LIBRARY_CORE_STATIC}) target_link_libraries(libcaf_io_static ${CAF_EXTRA_LDFLAGS} ${CAF_LIBRARY_CORE_STATIC})
set_target_properties(libcaf_io_static PROPERTIES OUTPUT_NAME caf_io_static) set_target_properties(libcaf_io_static PROPERTIES OUTPUT_NAME caf_io_static)
install(TARGETS libcaf_io_static ARCHIVE DESTINATION lib) install(TARGETS libcaf_io_static ARCHIVE DESTINATION lib)
add_dependencies(libcaf_io_static libcaf_io) add_dependencies(libcaf_io_static libcaf_io)
......
...@@ -21,7 +21,7 @@ set(LIBCAF_OPENCL_SRCS ...@@ -21,7 +21,7 @@ set(LIBCAF_OPENCL_SRCS
if(NOT CAF_BUILD_STATIC_ONLY) if(NOT CAF_BUILD_STATIC_ONLY)
add_library(libcaf_opencl_shared SHARED ${LIBCAF_OPENCL_SRCS} add_library(libcaf_opencl_shared SHARED ${LIBCAF_OPENCL_SRCS}
${LIBCAF_OPENCL_HDRS} ${OpenCL_INCLUDE_DIRS}) ${LIBCAF_OPENCL_HDRS} ${OpenCL_INCLUDE_DIRS})
target_link_libraries(libcaf_opencl_shared ${LD_FLAGS} target_link_libraries(libcaf_opencl_shared ${CAF_EXTRA_LDFLAGS}
${CAF_LIBRARY_CORE} ${CAF_LIBRARY_CORE}
${OpenCL_LIBRARIES}) ${OpenCL_LIBRARIES})
set_target_properties(libcaf_opencl_shared set_target_properties(libcaf_opencl_shared
...@@ -39,7 +39,7 @@ if(CAF_BUILD_STATIC_ONLY OR CAF_BUILD_STATIC) ...@@ -39,7 +39,7 @@ if(CAF_BUILD_STATIC_ONLY OR CAF_BUILD_STATIC)
add_library(libcaf_opencl_static STATIC ${LIBCAF_OPENCL_SRCS} add_library(libcaf_opencl_static STATIC ${LIBCAF_OPENCL_SRCS}
${LIBCAF_OPENCL_HDRS} ${LIBCAF_OPENCL_HDRS}
${OpenCL_INCLUDE_DIRS}) ${OpenCL_INCLUDE_DIRS})
target_link_libraries(libcaf_opencl_static ${LD_FLAGS} target_link_libraries(libcaf_opencl_static ${CAF_EXTRA_LDFLAGS}
${CAF_LIBRARY_CORE_STATIC} ${CAF_LIBRARY_CORE_STATIC}
${OpenCL_LIBRARIES}) ${OpenCL_LIBRARIES})
set_target_properties(libcaf_opencl_static PROPERTIES OUTPUT_NAME caf_opencl_static) set_target_properties(libcaf_opencl_static PROPERTIES OUTPUT_NAME caf_opencl_static)
......
...@@ -12,7 +12,7 @@ if(OpenCL_LIBRARIES AND NOT CAF_NO_EXAMPLES) ...@@ -12,7 +12,7 @@ if(OpenCL_LIBRARIES AND NOT CAF_NO_EXAMPLES)
macro(add name folder) macro(add name folder)
add_executable(${name} ${folder}/${name}.cpp ${ARGN}) add_executable(${name} ${folder}/${name}.cpp ${ARGN})
target_link_libraries(${name} target_link_libraries(${name}
${LD_FLAGS} ${CAF_EXTRA_LDFLAGS}
${CAF_LIBRARIES} ${CAF_LIBRARIES}
${PTHREAD_LIBRARIES} ${PTHREAD_LIBRARIES}
${WSLIB} ${WSLIB}
......
...@@ -23,7 +23,7 @@ endif() ...@@ -23,7 +23,7 @@ endif()
if (NOT CAF_BUILD_STATIC_ONLY) if (NOT CAF_BUILD_STATIC_ONLY)
add_library(libcaf_openssl_shared SHARED add_library(libcaf_openssl_shared SHARED
${LIBCAF_OPENSSL_SRCS} ${LIBCAF_OPENSSL_HDRS}) ${LIBCAF_OPENSSL_SRCS} ${LIBCAF_OPENSSL_HDRS})
target_link_libraries(libcaf_openssl_shared ${LD_FLAGS} target_link_libraries(libcaf_openssl_shared ${CAF_EXTRA_LDFLAGS}
${CAF_LIBRARY_CORE} ${CAF_LIBRARY_IO} ${OPENSSL_LIBRARIES}) ${CAF_LIBRARY_CORE} ${CAF_LIBRARY_IO} ${OPENSSL_LIBRARIES})
if(NOT APPLE AND NOT WIN32) if(NOT APPLE AND NOT WIN32)
...@@ -47,7 +47,7 @@ endif () ...@@ -47,7 +47,7 @@ endif ()
if (CAF_BUILD_STATIC_ONLY OR CAF_BUILD_STATIC) if (CAF_BUILD_STATIC_ONLY OR CAF_BUILD_STATIC)
add_library(libcaf_openssl_static STATIC add_library(libcaf_openssl_static STATIC
${LIBCAF_OPENSSL_HDRS} ${LIBCAF_OPENSSL_SRCS}) ${LIBCAF_OPENSSL_HDRS} ${LIBCAF_OPENSSL_SRCS})
target_link_libraries(libcaf_openssl_static ${LD_FLAGS} target_link_libraries(libcaf_openssl_static ${CAF_EXTRA_LDFLAGS}
${CAF_LIBRARY_CORE_STATIC} ${CAF_LIBRARY_IO_STATIC} ${OPENSSL_LIBRARIES}) ${CAF_LIBRARY_CORE_STATIC} ${CAF_LIBRARY_IO_STATIC} ${OPENSSL_LIBRARIES})
set_target_properties(libcaf_openssl_static PROPERTIES set_target_properties(libcaf_openssl_static PROPERTIES
OUTPUT_NAME caf_openssl_static) OUTPUT_NAME caf_openssl_static)
......
...@@ -13,10 +13,10 @@ else() ...@@ -13,10 +13,10 @@ else()
execute_process(COMMAND "${CAF_PYTHON_CONFIG_BIN}" --ldflags execute_process(COMMAND "${CAF_PYTHON_CONFIG_BIN}" --ldflags
OUTPUT_VARIABLE PYTHON_LDFLAGS) OUTPUT_VARIABLE PYTHON_LDFLAGS)
string(STRIP "${PYTHON_LDFLAGS}" PYTHON_LDFLAGS) string(STRIP "${PYTHON_LDFLAGS}" PYTHON_LDFLAGS)
if ("${LD_FLAGS}" STREQUAL "") if ("${CAF_EXTRA_LDFLAGS}" STREQUAL "")
set(LD_FLAGS "${PYTHON_LDFLAGS}") set(CAF_EXTRA_LDFLAGS "${PYTHON_LDFLAGS}")
else() else()
set(LD_FLAGS "${LD_FLAGS} ${PYTHON_LDFLAGS}") set(CAF_EXTRA_LDFLAGS "${CAF_EXTRA_LDFLAGS} ${PYTHON_LDFLAGS}")
endif() endif()
string(REPLACE " -I" ";-I" dir_list ${PYTHON_INCLUDE_FLAGS}) string(REPLACE " -I" ";-I" dir_list ${PYTHON_INCLUDE_FLAGS})
foreach(flag ${dir_list}) foreach(flag ${dir_list})
...@@ -46,7 +46,7 @@ if(NOT CAF_NO_PYTHON) ...@@ -46,7 +46,7 @@ if(NOT CAF_NO_PYTHON)
include_directories("${CMAKE_CURRENT_SOURCE_DIR}") include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
add_executable(caf-python ${CAF_PYTHON_SRCS} ${CAF_PYTHON_HDRS}) add_executable(caf-python ${CAF_PYTHON_SRCS} ${CAF_PYTHON_HDRS})
target_link_libraries(caf-python target_link_libraries(caf-python
${LD_FLAGS} ${CAF_EXTRA_LDFLAGS}
${CAF_LIBRARY_CORE} ${CAF_LIBRARY_CORE}
${CAF_LIBRARY_IO} ${CAF_LIBRARY_IO}
${CAF_LIBRARY_RIAC} ${CAF_LIBRARY_RIAC}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment