Commit 4da53f18 authored by Dominik Charousset's avatar Dominik Charousset

fixed CMake issue w/ generator

parent a68a97b4
...@@ -92,6 +92,14 @@ else () ...@@ -92,6 +92,14 @@ else ()
message(FATAL_ERROR "This platform is not supported by libcppa") message(FATAL_ERROR "This platform is not supported by libcppa")
endif() endif()
file(GLOB LIBCPPA_HDRS "cppa/*.hpp"
"cppa/detail/*.hpp"
"cppa/intrusive/*.hpp"
"cppa/io/*.hpp"
"cppa/opencl/*.hpp"
"cppa/qtsupport/*.hpp"
"cppa/util/*.hpp")
set(LIBCPPA_SRC set(LIBCPPA_SRC
${LIBCPPA_PLATFORM_SRC} ${LIBCPPA_PLATFORM_SRC}
src/abstract_tuple.cpp src/abstract_tuple.cpp
...@@ -239,7 +247,7 @@ endif () ...@@ -239,7 +247,7 @@ endif ()
# bulid shared library only if not comiling static only # bulid shared library only if not comiling static only
if (NOT "${CPPA_BUILD_STATIC_ONLY}" STREQUAL "yes") if (NOT "${CPPA_BUILD_STATIC_ONLY}" STREQUAL "yes")
add_library(libcppa SHARED ${LIBCPPA_SRC}) add_library(libcppa SHARED ${LIBCPPA_HDRS} ${LIBCPPA_SRC})
target_link_libraries(libcppa ${LD_FLAGS}) target_link_libraries(libcppa ${LD_FLAGS})
set(LIBRARY_VERSION ${LIBCPPA_VERSION_MAJOR}.${LIBCPPA_VERSION_MINOR}.${LIBCPPA_VERSION_PATCH}) set(LIBRARY_VERSION ${LIBCPPA_VERSION_MAJOR}.${LIBCPPA_VERSION_MINOR}.${LIBCPPA_VERSION_PATCH})
set(LIBRARY_SOVERSION ${LIBCPPA_VERSION_MAJOR}) set(LIBRARY_SOVERSION ${LIBCPPA_VERSION_MAJOR})
...@@ -253,7 +261,7 @@ endif () ...@@ -253,7 +261,7 @@ endif ()
# build static library if --build-static or --build-static-only was set # build static library if --build-static or --build-static-only was set
if ("${CPPA_BUILD_STATIC_ONLY}" STREQUAL "yes" OR "${CPPA_BUILD_STATIC}" STREQUAL "yes") if ("${CPPA_BUILD_STATIC_ONLY}" STREQUAL "yes" OR "${CPPA_BUILD_STATIC}" STREQUAL "yes")
add_library(libcppaStatic STATIC ${LIBCPPA_SRC}) add_library(libcppaStatic STATIC ${LIBCPPA_HDRS} ${LIBCPPA_SRC})
set_target_properties(libcppaStatic PROPERTIES OUTPUT_NAME cppa_static) set_target_properties(libcppaStatic PROPERTIES OUTPUT_NAME cppa_static)
install(TARGETS libcppaStatic ARCHIVE DESTINATION lib) install(TARGETS libcppaStatic ARCHIVE DESTINATION lib)
endif () endif ()
......
...@@ -123,9 +123,9 @@ configure () ...@@ -123,9 +123,9 @@ configure ()
cd $workdir cd $workdir
if [ -n "$5" ]; then if [ -n "$5" ]; then
cmake -G "$5" $CMakeCacheEntries $sourcedir cmake -G "$5" "$CMakeCacheEntries" "$sourcedir"
else else
cmake $CMakeCacheEntries $sourcedir cmake "$CMakeCacheEntries" "$sourcedir"
fi fi
echo "# This is the command used to configure this build" > config.status echo "# This is the command used to configure this build" > config.status
...@@ -271,7 +271,7 @@ else ...@@ -271,7 +271,7 @@ else
compiler=$gcc compiler=$gcc
fi fi
configure $compiler "" $bindir $libdir $CMakeGenerator configure "$compiler" "" "$bindir" "$libdir" "$CMakeGenerator"
fi fi
printf "DIRS := %s\n\n" "$workdirs" > $sourcedir/Makefile printf "DIRS := %s\n\n" "$workdirs" > $sourcedir/Makefile
......
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