@@ -2,9 +2,9 @@ cmake_minimum_required(VERSION 2.8)
2
2
project (BTpp )
3
3
4
4
set (CMAKE_BUILD_TYPE Release )
5
- add_definitions (-lX11 -Wall -lglut -lGL -lgtest -std=c++11 -pthread -lrt )
5
+ add_definitions (-lX11 -Wall -lglut -lGL -lgtest -std=c++11 -lrt )
6
6
# Needed for using threads
7
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread" )
7
+ # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
8
8
9
9
10
10
@@ -106,8 +106,8 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
106
106
# COMPILING GTEST
107
107
######################################################
108
108
if (GTEST_FOUND )
109
- add_executable (btpp_gtest gtest/gtest_tree.cpp ${BTSrcLibrary} ${BTHeadLibrary} )
110
- target_link_libraries (btpp_gtest ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES} ${X11_LIBRARIES} )
109
+ # add_executable(btpp_gtest gtest/gtest_tree.cpp ${BTSrcLibrary} ${BTHeadLibrary})
110
+ # target_link_libraries(btpp_gtest ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES} ${X11_LIBRARIES})
111
111
endif (GTEST_FOUND )
112
112
113
113
######################################################
@@ -136,35 +136,40 @@ export(TARGETS BTppLib
136
136
# (this registers the build-tree with a global CMake-registry)
137
137
export (PACKAGE BTpp )
138
138
139
+ message ("******************" ${INSTALL_INCLUDE_DIR} )
140
+
141
+ install (FILES ${BTHeadLibrary} DESTINATION ${INSTALL_INCLUDE_DIR} /include/BTpp )
142
+
139
143
140
144
install (TARGETS BTppLib
141
- # IMPORTANT: Add the foo library to the "export-set"
145
+ # IMPORTANT: Add the library to the "export-set"
142
146
EXPORT BTppTargets
143
- ARCHIVE DESTINATION "${PROJECT_BINARY_DIR} /arc "
144
- RUNTIME DESTINATION "${PROJECT_BINARY_DIR} /bin" COMPONENT ${PROJECT_SOURCE_DIR } /bin
145
- LIBRARY DESTINATION "${PROJECT_BINARY_DIR} /lib" COMPONENT ${PROJECT_SOURCE_DIR } /shlib
146
- PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR} /BTpp"
147
- COMPONENT dev )
147
+ ARCHIVE DESTINATION "${INSTALL_CMAKE_DIR} /BTpp/lib "
148
+ RUNTIME DESTINATION "${PROJECT_BINARY_DIR} /bin" COMPONENT ${PROJECT_BINARY_DIR } /bin
149
+ LIBRARY DESTINATION "${PROJECT_BINARY_DIR} /lib" COMPONENT ${PROJECT_BINARY_DIR } /shlib
150
+ PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR} /include/ BTpp"
151
+ COMPONENT ${INSTALL_CMAKE_DIR} "include/BTpp" )
148
152
149
153
150
- # Create the FooBarConfig .cmake and FooBarConfigVersion files
154
+ # Create the BTppConfig .cmake and BTppConfigVersion files
151
155
file (RELATIVE_PATH REL_INCLUDE_DIR "${INSTALL_CMAKE_DIR} "
152
156
"${INSTALL_INCLUDE_DIR} " )
153
157
# ... for the build tree
154
158
155
159
156
- set (CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR} / include" " ${PROJECT_BINARY_DIR} " )
160
+ set (CONF_INCLUDE_DIRS "${INSTALL_INCLUDE_DIR} include/BTpp " )
157
161
configure_file (conf/BTppConfig.cmake.in
158
162
"${PROJECT_BINARY_DIR} /BTppConfig.cmake" @ONLY )
163
+
159
164
# ... for the install tree
160
- set (CONF_INCLUDE_DIRS "\$ {BTpp_CMAKE_DIR}/${REL_INCLUDE_DIR} " )
165
+ # set(CONF_INCLUDE_DIRS "\${BTpp_CMAKE_DIR}/${REL_INCLUDE_DIR}")
161
166
configure_file (conf/BTppConfig.cmake.in
162
167
"${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY} /BTppConfig.cmake" @ONLY )
163
168
# ... for both
164
169
configure_file (conf/BTppConfigVersion.cmake.in
165
170
"${PROJECT_BINARY_DIR} /BTppConfigVersion.cmake" @ONLY )
166
171
167
- # Install the YARPBTCoreConfig .cmake and YARPBTCoreConfigVersion .cmake
172
+ # Install the BTppConfig .cmake and BTppConfigVersion .cmake
168
173
install (FILES
169
174
"${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY} /BTppConfig.cmake"
170
175
"${PROJECT_BINARY_DIR} /BTppConfigVersion.cmake"
@@ -175,3 +180,4 @@ install(EXPORT BTppTargets DESTINATION
175
180
"${INSTALL_CMAKE_DIR} " COMPONENT dev )
176
181
177
182
183
+ message ("******************" ${CONF_INCLUDE_DIRS} )
0 commit comments