Skip to content

Commit f642042

Browse files
committed
better installation
1 parent 04716f6 commit f642042

File tree

1 file changed

+23
-10
lines changed

1 file changed

+23
-10
lines changed

CMakeLists.txt

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ cmake_minimum_required(VERSION 2.8)
22
project(BTpp)
33

44
set(CMAKE_BUILD_TYPE Release)
5-
add_definitions(-Wall -lglut -lGL -lgtest -std=c++11 -lX11)
6-
5+
add_definitions(-lX11 -Wall -lglut -lGL -lgtest -std=c++11 -pthread -lrt )
76
# Needed for using threads
8-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
7+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
8+
99

1010

1111
#########################################################
@@ -15,6 +15,9 @@ find_package(X11 REQUIRED)
1515
include_directories(${X11_INCLUDE_DIR})
1616
link_directories(${X11_LIBRARIES})
1717

18+
#########################################################
19+
# FIND GTest
20+
#########################################################
1821
find_package(GTest)
1922
include_directories(${GTEST_INCLUDE_DIRS})
2023
if(NOT GTEST_FOUND)
@@ -90,7 +93,7 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
9093
######################################################
9194
if(GTEST_FOUND)
9295
add_executable(btpp_gtest gtest/gtest_tree.cpp ${BTSrcLibrary} ${BTHeadLibrary})
93-
target_link_libraries(btpp_gtest ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES})
96+
target_link_libraries(btpp_gtest ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES} ${X11_LIBRARIES})
9497
endif(GTEST_FOUND)
9598

9699
######################################################
@@ -102,17 +105,27 @@ target_link_libraries(btpp_example ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} ${X11_LI
102105
######################################################
103106
# COMPILING LIBRARY
104107
######################################################
105-
add_library(btpp SHARED ${BTSrcLibrary} ${BTHeadLibrary})
106-
target_link_libraries(btpp ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} ${X11_LIBRARIES})
108+
add_library(BTpp STATIC ${BTSrcLibrary} ${BTHeadLibrary})
109+
target_link_libraries(BTpp ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} ${X11_LIBRARIES})
107110

108111
######################################################
109112
# INSTALLATION OF LIBRARY AND EXECUTABLE TO /usr/local
110113
######################################################
111-
install(TARGETS btpp
112-
EXPORT btpp-targets
113-
DESTINATION lib
114+
install(TARGETS BTpp
115+
EXPORT btpp-targets
116+
DESTINATION lib/BTpp
114117
)
115118

116-
#install(FILES ${BTHeadLibrary} DESTINATION include/)
119+
export(PACKAGE BTpp)
120+
121+
install(EXPORT btpp-targets DESTINATION lib/BTpp)
122+
123+
install(FILES btpp-config.cmake DESTINATION lib/BTpp)
124+
#set(btpp_INCLUDE_DIRS /usr/local/include/BTpp)
125+
#set(btpp_LIBRARY /usr/local/lib/BTpp/libbtpp.a)
126+
#message("the value of btpp_INCLUDE_DIRS: " ${btpp_INCLUDE_DIRS})
127+
#message("the value of btpp_LIBRARY: " ${btpp_LIBRARY})
128+
129+
117130

118131

0 commit comments

Comments
 (0)