Commit 0f088db7 authored by neverlord's avatar neverlord Committed by Dominik Charousset

No install targets on WIN32 and no compiler check

parent a8a2f614
...@@ -69,7 +69,7 @@ endif() ...@@ -69,7 +69,7 @@ endif()
################################################################################ ################################################################################
# check for g++ >= 4.7 or clang++ > = 3.2 # check for g++ >= 4.7 or clang++ > = 3.2
if(NOT NO_COMPILER_CHECK) if(NOT WIN32 AND NOT NO_COMPILER_CHECK)
try_run(ProgramResult try_run(ProgramResult
CompilationSucceeded CompilationSucceeded
"${CMAKE_BINARY_DIR}" "${CMAKE_BINARY_DIR}"
......
...@@ -87,7 +87,7 @@ if (NOT "${CAF_BUILD_STATIC_ONLY}" STREQUAL "yes") ...@@ -87,7 +87,7 @@ if (NOT "${CAF_BUILD_STATIC_ONLY}" STREQUAL "yes")
SOVERSION ${LIBRARY_SOVERSION} SOVERSION ${LIBRARY_SOVERSION}
VERSION ${CAF_VERSION} VERSION ${CAF_VERSION}
OUTPUT_NAME caf_core) OUTPUT_NAME caf_core)
if(NOT MINGW) if(NOT WIN32)
install(TARGETS libcaf_core LIBRARY DESTINATION lib) install(TARGETS libcaf_core LIBRARY DESTINATION lib)
endif() endif()
endif () endif ()
...@@ -96,7 +96,7 @@ endif () ...@@ -96,7 +96,7 @@ endif ()
if ("${CAF_BUILD_STATIC_ONLY}" STREQUAL "yes" OR "${CAF_BUILD_STATIC}" STREQUAL "yes") if ("${CAF_BUILD_STATIC_ONLY}" STREQUAL "yes" OR "${CAF_BUILD_STATIC}" STREQUAL "yes")
add_library(libcaf_coreStatic STATIC ${LIBCAF_CORE_HDRS} ${LIBCAF_CORE_SRCS}) add_library(libcaf_coreStatic STATIC ${LIBCAF_CORE_HDRS} ${LIBCAF_CORE_SRCS})
set_target_properties(libcaf_coreStatic PROPERTIES OUTPUT_NAME caf_core_static) set_target_properties(libcaf_coreStatic PROPERTIES OUTPUT_NAME caf_core_static)
if(NOT MINGW) if(NOT WIN32)
install(TARGETS libcaf_coreStatic ARCHIVE DESTINATION lib) install(TARGETS libcaf_coreStatic ARCHIVE DESTINATION lib)
endif() endif()
endif () endif ()
......
...@@ -31,7 +31,7 @@ if (NOT "${CAF_BUILD_STATIC_ONLY}" STREQUAL "yes") ...@@ -31,7 +31,7 @@ if (NOT "${CAF_BUILD_STATIC_ONLY}" STREQUAL "yes")
SOVERSION ${LIBRARY_SOVERSION} SOVERSION ${LIBRARY_SOVERSION}
VERSION ${CAF_VERSION} VERSION ${CAF_VERSION}
OUTPUT_NAME caf_io) OUTPUT_NAME caf_io)
if(NOT MINGW) if(NOT WIN32)
install(TARGETS libcaf_io LIBRARY DESTINATION lib) install(TARGETS libcaf_io LIBRARY DESTINATION lib)
endif() endif()
endif () endif ()
...@@ -40,12 +40,16 @@ endif () ...@@ -40,12 +40,16 @@ endif ()
if ("${CAF_BUILD_STATIC_ONLY}" STREQUAL "yes" OR "${CAF_BUILD_STATIC}" STREQUAL "yes") if ("${CAF_BUILD_STATIC_ONLY}" STREQUAL "yes" OR "${CAF_BUILD_STATIC}" STREQUAL "yes")
add_library(libcaf_ioStatic STATIC ${LIBCAF_IO_HDRS} ${LIBCAF_IO_SRCS}) add_library(libcaf_ioStatic STATIC ${LIBCAF_IO_HDRS} ${LIBCAF_IO_SRCS})
set_target_properties(libcaf_ioStatic PROPERTIES OUTPUT_NAME caf_io_static) set_target_properties(libcaf_ioStatic PROPERTIES OUTPUT_NAME caf_io_static)
if(NOT WIN32)
install(TARGETS libcaf_ioStatic ARCHIVE DESTINATION lib) install(TARGETS libcaf_ioStatic ARCHIVE DESTINATION lib)
endif()
endif () endif ()
link_directories(${LD_DIRS}) link_directories(${LD_DIRS})
include_directories(. ${INCLUDE_DIRS}) include_directories(. ${INCLUDE_DIRS})
# install includes # install includes
install(DIRECTORY caf/ DESTINATION include/caf FILES_MATCHING PATTERN "*.hpp") if(NOT WIN32)
install(DIRECTORY cppa/ DESTINATION include/cppa FILES_MATCHING PATTERN "*.hpp") install(DIRECTORY caf/ DESTINATION include/caf FILES_MATCHING PATTERN "*.hpp")
install(DIRECTORY cppa/ DESTINATION include/cppa FILES_MATCHING PATTERN "*.hpp")
endif()
\ No newline at end of file
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