From 17fa3968282479c4fc718e819221a579c3c8d6e1 Mon Sep 17 00:00:00 2001 From: per Date: Mon, 11 Aug 2014 23:56:04 +0200 Subject: [PATCH 1/3] Added install target --- CMakeLists.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4dd509a..e1cf641 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,6 +47,7 @@ ENDIF( ) IF ( glew-cmake_BUILD_STATIC ) SET_PROPERTY( TARGET libglew_static PROPERTY ARCHIVE_OUTPUT_NAME "glew" ) SET_PROPERTY( TARGET libglew_static PROPERTY DEBUG_POSTFIX d ) + INSTALL(TARGETS libglew_static DESTINATION lib) ENDIF ( ) IF ( glew-cmake_BUILD_SHARED ) @@ -58,8 +59,12 @@ IF ( glew-cmake_BUILD_SHARED ) SET_PROPERTY( TARGET libglew_shared PROPERTY DEBUG_POSTFIX d ) TARGET_LINK_LIBRARIES( libglew_shared ${GL_LIBRARY} ) + INSTALL(TARGETS libglew_shared DESTINATION lib) ENDIF ( ) +file(GLOB PUBLIC_HEADERS "include/GL/*.h") +install(FILES ${PUBLIC_HEADERS} DESTINATION include/GL/) + IF( ${CMAKE_CURRENT_SOURCE_DIR} STREQUAL ${CMAKE_SOURCE_DIR} AND NOT ONLY_LIBS ) SET( GLEWINFO_SRCS ${SRC_DIR}/glewinfo.c ) SET( VISUALINFO_SRCS ${SRC_DIR}/visualinfo.c ) @@ -75,5 +80,7 @@ IF( ${CMAKE_CURRENT_SOURCE_DIR} STREQUAL ${CMAKE_SOURCE_DIR} AND NOT ONLY_LIBS ) TARGET_LINK_LIBRARIES( glewinfo libglew_static ${GL_LIBRARY} ) TARGET_LINK_LIBRARIES( visualinfo libglew_static ${GL_LIBRARY} ) ENDIF ( ) + + INSTALL(TARGETS glewinfo visualinfo DESTINATION bin) ENDIF( ) From 9ac6bc4ebb0b0262823086c78c828f494037e417 Mon Sep 17 00:00:00 2001 From: per Date: Wed, 13 Aug 2014 09:49:51 +0200 Subject: [PATCH 2/3] style mismatch --- CMakeLists.txt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e1cf641..97dd99f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,7 +47,7 @@ ENDIF( ) IF ( glew-cmake_BUILD_STATIC ) SET_PROPERTY( TARGET libglew_static PROPERTY ARCHIVE_OUTPUT_NAME "glew" ) SET_PROPERTY( TARGET libglew_static PROPERTY DEBUG_POSTFIX d ) - INSTALL(TARGETS libglew_static DESTINATION lib) + INSTALL( TARGETS libglew_static DESTINATION lib ) ENDIF ( ) IF ( glew-cmake_BUILD_SHARED ) @@ -59,11 +59,11 @@ IF ( glew-cmake_BUILD_SHARED ) SET_PROPERTY( TARGET libglew_shared PROPERTY DEBUG_POSTFIX d ) TARGET_LINK_LIBRARIES( libglew_shared ${GL_LIBRARY} ) - INSTALL(TARGETS libglew_shared DESTINATION lib) + INSTALL( TARGETS libglew_shared DESTINATION lib ) ENDIF ( ) -file(GLOB PUBLIC_HEADERS "include/GL/*.h") -install(FILES ${PUBLIC_HEADERS} DESTINATION include/GL/) +FILE(GLOB PUBLIC_HEADERS "include/GL/*.h") +INSTALL(FILES ${PUBLIC_HEADERS} DESTINATION include/GL/) IF( ${CMAKE_CURRENT_SOURCE_DIR} STREQUAL ${CMAKE_SOURCE_DIR} AND NOT ONLY_LIBS ) SET( GLEWINFO_SRCS ${SRC_DIR}/glewinfo.c ) @@ -81,6 +81,5 @@ IF( ${CMAKE_CURRENT_SOURCE_DIR} STREQUAL ${CMAKE_SOURCE_DIR} AND NOT ONLY_LIBS ) TARGET_LINK_LIBRARIES( visualinfo libglew_static ${GL_LIBRARY} ) ENDIF ( ) - INSTALL(TARGETS glewinfo visualinfo DESTINATION bin) - + INSTALL( TARGETS glewinfo visualinfo DESTINATION bin ) ENDIF( ) From a9ceeeedebaf314403e89ccc77240a71a02d472c Mon Sep 17 00:00:00 2001 From: per Date: Wed, 13 Aug 2014 09:50:43 +0200 Subject: [PATCH 3/3] style mismatch --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 97dd99f..207adfe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,8 +62,8 @@ IF ( glew-cmake_BUILD_SHARED ) INSTALL( TARGETS libglew_shared DESTINATION lib ) ENDIF ( ) -FILE(GLOB PUBLIC_HEADERS "include/GL/*.h") -INSTALL(FILES ${PUBLIC_HEADERS} DESTINATION include/GL/) +FILE( GLOB PUBLIC_HEADERS "include/GL/*.h" ) +INSTALL( FILES ${PUBLIC_HEADERS} DESTINATION include/GL/ ) IF( ${CMAKE_CURRENT_SOURCE_DIR} STREQUAL ${CMAKE_SOURCE_DIR} AND NOT ONLY_LIBS ) SET( GLEWINFO_SRCS ${SRC_DIR}/glewinfo.c )