Skip to content

Commit

Permalink
Merge pull request #5 from leon-m/master
Browse files Browse the repository at this point in the history
CMakefile
  • Loading branch information
leon-m authored Sep 18, 2018
2 parents 69640f9 + eb39520 commit 1ee6658
Showing 1 changed file with 11 additions and 8 deletions.
19 changes: 11 additions & 8 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ cmake_minimum_required(VERSION 2.8)
## #######################################################################

# version number and SOVERSION
set (COOL_VERSION "0.0.0")
set (COOL_SOVERSION "0")
set (COOL_VERSION "0.1.0")
set (COOL_SOVERSION "1")

# defaults if input variables aren't set

Expand Down Expand Up @@ -121,10 +121,10 @@ endif()

add_definitions(-D${TARGET})

include_directories(${COOL_HOME}/include /usr/local/include)
if (WIN32)
include_directories(${xdispatch_DIR}/libdispatch/include)
endif()
#include_directories(${COOL_HOME}/include /usr/local/include)
#if (WIN32)
# include_directories(${xdispatch_DIR}/libdispatch/include)
#endif()

if (OSX)
set(DISABLED_WARNINGS -Wno-undefined-bool-conversion)
Expand Down Expand Up @@ -184,8 +184,7 @@ source_group("Impl Source Files" FILES ${COOL_SRCS})

if (COOL_DYNAMIC)
add_library(${COOL_LIBRARY_NAME} SHARED ${COOL_SRCS} ${COOL_HEADERS} ${COOL_IMPL_HEADERS})
set_target_properties(${COOL_LIBRARY_NAME} PROPERTIES VERSION ${COOL_VERSION})
set_target_properties(${COOL_LIBRARY_NAME} PROPERTIES SOVERSION ${COOL_SOVERSION})
set_target_properties( ${COOL_LIBRARY_NAME} PROPERTIES VERSION ${COOL_VERSION} SOVERSION ${COOL_SOVERSION} )
if (WIN32)
set_target_properties(${COOL_LIBRARY_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${COOL_LIBRARY_DIR})
set_target_properties(${COOL_LIBRARY_NAME} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${COOL_LIBRARY_DIR})
Expand All @@ -198,6 +197,10 @@ else()
endif()

target_link_libraries(${COOL_LIBRARY_NAME} ${COOL_LINK_LIBRARIES})
target_include_directories(${COOL_LIBRARY_NAME} PUBLIC ${COOL_HOME}/include)
if (WIN32)
target_include_directories(${COOL_LIBRARY_NAME} PUBLIC ${xdispatch_DIR}/libdispatch/include)
endif()

# --- Tests
set (TESTS
Expand Down

0 comments on commit 1ee6658

Please sign in to comment.