Different install paths
This commit is contained in:
parent
83c1fc9eaf
commit
50a4cb15be
|
@ -8,7 +8,7 @@ compiler:
|
|||
- clang
|
||||
|
||||
before_install:
|
||||
- sudo apt-get install libtool autoconf git nasm
|
||||
- sudo apt-get install libtool autoconf git nasm pkg-config cmake libtiff-dev
|
||||
- chmod +x install.sh
|
||||
- ./install.sh
|
||||
|
||||
|
|
|
@ -18,7 +18,12 @@ configure_file(
|
|||
include_directories("${PROJECT_BINARY_DIR}")
|
||||
include_directories(/opt/mozjpeg/include)
|
||||
|
||||
link_directories(/opt/mozjpeg/lib)
|
||||
if(EXISTS /opt/mozjpeg/lib64)
|
||||
link_directories(/opt/mozjpeg/lib64)
|
||||
else()
|
||||
link_directories(/opt/mozjpeg/lib)
|
||||
endif()
|
||||
|
||||
|
||||
add_subdirectory(caesium)
|
||||
add_subdirectory(demo)
|
||||
|
|
|
@ -9,15 +9,27 @@ add_library(caesium_static STATIC caesium.c error.c utils.c png.c lodepng.c jpeg
|
|||
|
||||
set_target_properties(caesium_static PROPERTIES OUTPUT_NAME caesium)
|
||||
|
||||
target_link_libraries(caesium_static zopflipng jpeg turbojpeg tiff)
|
||||
target_link_libraries(caesium zopflipng jpeg turbojpeg tiff)
|
||||
|
||||
# Make sure the compiler can find include files for our Caesium library
|
||||
# when other libraries or executables link to Caesium
|
||||
target_include_directories(caesium PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
target_include_directories(caesium_static PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
|
||||
# OSX installs in local
|
||||
if(APPLE)
|
||||
install(FILES caesium.h DESTINATION /usr/local/include)
|
||||
install(TARGETS LIBRARY DESTINATION /usr/local/lib)
|
||||
install(TARGETS ARCHIVE DESTINATION /usr/local/lib)
|
||||
endif()
|
||||
|
||||
if(UNIX AND NOT APPLE)
|
||||
install(FILES caesium.h DESTINATION /usr/include)
|
||||
install(TARGETS LIBRARY DESTINATION /usr/lib)
|
||||
install(TARGETS ARCHIVE DESTINATION /usr/lib)
|
||||
endif()
|
||||
|
||||
# Fallback
|
||||
install(FILES caesium.h DESTINATION include)
|
||||
install(TARGETS caesium caesium_static
|
||||
LIBRARY DESTINATION lib
|
||||
ARCHIVE DESTINATION lib)
|
||||
ARCHIVE DESTINATION lib)
|
Loading…
Reference in New Issue