Browse Source

Merge branch 'master' into linenumbermerge

master
oyvang 11 years ago
parent
commit
bcd75be1b9
  1. 5
      juci/CMakeLists.txt
  2. 7
      juci/cmake/Modules/FindTestlcl.cmake

5
juci/CMakeLists.txt

@ -92,8 +92,6 @@ add_library(${module} SHARED
) )
# dependencies # dependencies
if(${lcl_NOTFOUND}) if(${lcl_NOTFOUND})
message("FATAL_ERROR ohh lord!") message("FATAL_ERROR ohh lord!")
else() else()
@ -113,7 +111,8 @@ link_directories(
${LCL_LIBRARY_DIRS} ${LCL_LIBRARY_DIRS}
) )
#module: #module:
set_target_properties(${module} PROPERTIES PREFIX "") set_target_properties(${module} PROPERTIES PREFIX ""
LIBRARY_OUTPUT_DIRECTORY "/usr/lib/python2.7/dist-packages/")
target_link_libraries(${module} ${PYTHON_LIBRARIES} ${Boost_LIBRARIES}) target_link_libraries(${module} ${PYTHON_LIBRARIES} ${Boost_LIBRARIES})
#executable: #executable:
target_link_libraries(${project_name} ${LCL_LIBRARIES} ${GTKMM_LIBRARIES} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES}) target_link_libraries(${project_name} ${LCL_LIBRARIES} ${GTKMM_LIBRARIES} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES})

7
juci/cmake/Modules/FindTestlcl.cmake

@ -11,10 +11,15 @@ find_package(PkgConfig)
find_path(LCL_INCLUDE_DIR headers/TranslationUnit.h find_path(LCL_INCLUDE_DIR headers/TranslationUnit.h
HINTS "/home/gm/bachelor/lib/" HINTS "/home/gm/bachelor/lib/"
"/home/forgie/code/libclangpp/"
"/home/zalox/bachelor/libclang++/"
) )
find_library(LCL_LIBRARY NAMES testlcl find_library(LCL_LIBRARY NAMES testlcl
HINTS "/home/gm/bachelor/lib/lib/") HINTS "/home/gm/bachelor/lib/lib/"
"/home/forgie/code/libclangpp/lib/"
"/home/zalox/bachelor/libclang++/lib/"
)
set(LCL_LIBRARIES ${LCL_LIBRARY} ) set(LCL_LIBRARIES ${LCL_LIBRARY} )
set(LCL_INCLUDE_DIRS ${LCL_INCLUDE_DIR} ) set(LCL_INCLUDE_DIRS ${LCL_INCLUDE_DIR} )

Loading…
Cancel
Save