X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=kernel%2Fsrc%2FCMakeLists.txt;h=23d4dd54cfa88c443c74a2babc70eba567c43f89;hb=302e341409d918a232cd2ec25f2c533c27eb9011;hp=48f775e4f7ddb38a5b77d1df44cccd5230bb9066;hpb=8ab3078737deb219443554b0df6be43b3bd82d11;p=bbtk.git diff --git a/kernel/src/CMakeLists.txt b/kernel/src/CMakeLists.txt index 48f775e..23d4dd5 100644 --- a/kernel/src/CMakeLists.txt +++ b/kernel/src/CMakeLists.txt @@ -151,9 +151,11 @@ ENDIF(NOT BBTK_INSTALL_NO_DEVELOPMENT) # Symbols must be exported (Windows) ADD_DEF(BBTK_EXPORT_SYMBOLS) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty) + #----------------------------------------------------------------------------- # Sources files -FILE(GLOB SOURCES "." "*.cxx" "*.cpp") +FILE(GLOB SOURCES "." "*.cxx" "*.cpp" "ThirdParty/wx/treemultictrl/*.cpp") FILE(GLOB SOURCES_H "." "*.h" ) #----------------------------------------------------------------------------- # lib definition @@ -190,6 +192,9 @@ TARGET_LINK_LIBRARIES(bbtk ${BBTK_LINK_LIBRARIES}) FILE(GLOB BBTK_HEADERS "*.h") INSTALL(FILES ${BBTK_HEADERS} DESTINATION include/bbtk) INSTALL(TARGETS bbtk DESTINATION lib) +IF(WIN32) + INSTALL(TARGETS bbtk DESTINATION bin/) +ENDIF(WIN32) #----------------------------------------------------------------------------- #----------------------------------------------------------------------------- @@ -197,11 +202,6 @@ INSTALL(TARGETS bbtk DESTINATION lib) # Uses CMakeCreateFindPackage #----------------------------------------------------------------------------- -#----------------------------------------------------------------------------- -# Today CMakeCreateFindPackage is copied in kernel/cmake -# When installed as a separate project will have to find it with FIND_PACKAGE -SET(CMakeCreateFindPackage_DIR ${PROJECT_SOURCE_DIR}/kernel/cmake) -#----------------------------------------------------------------------------- #----------------------------------------------------------------------------- # - Set the variable LIBRARY_NAME to the name of your library