From 66b6d021b7cdf082928b2b66066849baf473694a Mon Sep 17 00:00:00 2001 From: magestik Date: Mon, 18 Jan 2016 23:26:44 +0100 Subject: [PATCH] export cmake targets --- src/nvcore/CMakeLists.txt | 55 +++++++++++++++++++------------------ src/nvimage/CMakeLists.txt | 3 +- src/nvmath/CMakeLists.txt | 35 +++++++++++------------ src/nvthread/CMakeLists.txt | 3 +- src/nvtt/CMakeLists.txt | 5 +++- 5 files changed, 54 insertions(+), 47 deletions(-) diff --git a/src/nvcore/CMakeLists.txt b/src/nvcore/CMakeLists.txt index 9246768..d8fcf1f 100644 --- a/src/nvcore/CMakeLists.txt +++ b/src/nvcore/CMakeLists.txt @@ -1,24 +1,25 @@ PROJECT(nvcore) SET(CORE_SRCS - nvcore.h - Array.h - Debug.h Debug.cpp - DefsGnucDarwin.h - DefsGnucLinux.h - DefsGnucWin32.h - DefsVcWin32.h - FileSystem.h FileSystem.cpp - ForEach.h - Memory.h Memory.cpp - Ptr.h - RefCounted.h - StrLib.h StrLib.cpp - Stream.h - StdStream.h - TextWriter.h TextWriter.cpp - Timer.h Timer.cpp - Utils.h) + nvcore.h + Array.h + Debug.h Debug.cpp + DefsGnucDarwin.h + DefsGnucLinux.h + DefsGnucWin32.h + DefsVcWin32.h + FileSystem.h FileSystem.cpp + ForEach.h + Library.h Library.cpp + Memory.h Memory.cpp + Ptr.h + RefCounted.h + StrLib.h StrLib.cpp + Stream.h + StdStream.h + TextWriter.h TextWriter.cpp + Timer.h Timer.cpp + Utils.h) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) @@ -26,21 +27,21 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) ADD_DEFINITIONS(-DNVCORE_EXPORTS) IF(UNIX) - SET(LIBS ${LIBS} ${CMAKE_DL_LIBS}) + SET(LIBS ${LIBS} ${CMAKE_DL_LIBS}) ENDIF(UNIX) IF(NVCORE_SHARED) - ADD_DEFINITIONS(-DNVCORE_SHARED=1) - ADD_LIBRARY(nvcore SHARED ${CORE_SRCS}) + ADD_DEFINITIONS(-DNVCORE_SHARED=1) + ADD_LIBRARY(nvcore SHARED ${CORE_SRCS}) ELSE(NVCORE_SHARED) - ADD_LIBRARY(nvcore ${CORE_SRCS}) + ADD_LIBRARY(nvcore ${CORE_SRCS}) ENDIF(NVCORE_SHARED) TARGET_LINK_LIBRARIES(nvcore ${LIBS}) -INSTALL(TARGETS nvcore - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib/static) - +INSTALL(TARGETS nvcore EXPORT nvcore-targets + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib/static) +INSTALL(EXPORT nvcore-targets DESTINATION share/cmake) diff --git a/src/nvimage/CMakeLists.txt b/src/nvimage/CMakeLists.txt index 7a01681..73582bc 100644 --- a/src/nvimage/CMakeLists.txt +++ b/src/nvimage/CMakeLists.txt @@ -55,10 +55,11 @@ ENDIF(NVIMAGE_SHARED) TARGET_LINK_LIBRARIES(nvimage ${LIBS} nvcore nvmath) -INSTALL(TARGETS nvimage +INSTALL(TARGETS nvimage EXPORT nvimage-targets RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib/static) +INSTALL(EXPORT nvimage-targets DESTINATION share/cmake) INSTALL(FILES nvimage.h DirectDrawSurface.h Image.h DESTINATION include/nvimage) diff --git a/src/nvmath/CMakeLists.txt b/src/nvmath/CMakeLists.txt index 093f108..1a59542 100644 --- a/src/nvmath/CMakeLists.txt +++ b/src/nvmath/CMakeLists.txt @@ -1,16 +1,16 @@ PROJECT(nvmath) SET(MATH_SRCS - nvmath.h - Box.h Box.inl - Color.h Color.inl - Fitting.h Fitting.cpp - Half.h Half.cpp - Matrix.h - Plane.h Plane.inl Plane.cpp - SphericalHarmonic.h SphericalHarmonic.cpp - SimdVector.h SimdVector_SSE.h SimdVector_VE.h - Vector.h Vector.inl) + nvmath.h + Box.h Box.inl + Color.h Color.inl + Fitting.h Fitting.cpp + Half.h Half.cpp + Matrix.h + Plane.h Plane.inl Plane.cpp + SphericalHarmonic.h SphericalHarmonic.cpp + SimdVector.h SimdVector_SSE.h SimdVector_VE.h + Vector.h Vector.inl) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) @@ -18,15 +18,16 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) ADD_DEFINITIONS(-DNVMATH_EXPORTS) IF(NVMATH_SHARED) - ADD_DEFINITIONS(-DNVMATH_SHARED=1) - ADD_LIBRARY(nvmath SHARED ${MATH_SRCS}) + ADD_DEFINITIONS(-DNVMATH_SHARED=1) + ADD_LIBRARY(nvmath SHARED ${MATH_SRCS}) ELSE(NVMATH_SHARED) - ADD_LIBRARY(nvmath ${MATH_SRCS}) + ADD_LIBRARY(nvmath ${MATH_SRCS}) ENDIF(NVMATH_SHARED) TARGET_LINK_LIBRARIES(nvmath ${LIBS} nvcore) -INSTALL(TARGETS nvmath - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib/static) +INSTALL(TARGETS nvmath EXPORT nvmath-targets + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib/static) +INSTALL(EXPORT nvmath-targets DESTINATION share/cmake) diff --git a/src/nvthread/CMakeLists.txt b/src/nvthread/CMakeLists.txt index 15dbc4e..a3837fe 100644 --- a/src/nvthread/CMakeLists.txt +++ b/src/nvthread/CMakeLists.txt @@ -22,7 +22,8 @@ ENDIF(NVTHREAD_SHARED) TARGET_LINK_LIBRARIES(nvthread ${LIBS} nvcore) -INSTALL(TARGETS nvthread +INSTALL(TARGETS nvthread EXPORT nvthread-targets RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib/static) +INSTALL(EXPORT nvthread-targets DESTINATION share/cmake) diff --git a/src/nvtt/CMakeLists.txt b/src/nvtt/CMakeLists.txt index 05f95c2..54601b7 100644 --- a/src/nvtt/CMakeLists.txt +++ b/src/nvtt/CMakeLists.txt @@ -47,12 +47,15 @@ ELSE(NVTT_SHARED) ADD_LIBRARY(nvtt ${NVTT_SRCS} $) ENDIF(NVTT_SHARED) +TARGET_COMPILE_OPTIONS(nvtt PUBLIC ${OpenMP_CXX_FLAGS}) + TARGET_LINK_LIBRARIES(nvtt ${LIBS} nvcore nvimage nvthread nvmath) -INSTALL(TARGETS nvtt +INSTALL(TARGETS nvtt EXPORT nvtt-targets RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib/static) +INSTALL(EXPORT nvtt-targets DESTINATION share/cmake) INSTALL(FILES nvtt.h DESTINATION include/nvtt)