← Back to branch summary

~ubuntu-branches/ubuntu/trusty/ginkgocadx/trusty

« back to all changes in this revision

Viewing changes to src/cadxcore/CMakeLists.txt

  • Committer: Package Import Robot
  • Author(s): Dmitry Smirnov
  • Date: 2013-07-21 11:58:53 UTC
  • mfrom: (7.2.1 sid)
  • Revision ID: package-import@ubuntu.com-20130721115853-44e7n1xujqglu78e
Tags: 3.4.0.928.29+dfsg-1
* New upstream release [July 2013]
  + new B-D: "libjsoncpp-dev".
  + new patch "unbundle-libjsoncpp.patch" to avoid building bundled
    "libjsoncpp-dev".
  + new patch "fix-wx.patch" to avoid FTBFS due to missing
    "-lwx_gtk2u_html-2.8".
* Removed unnecessary versioned Build-Depends.
* Removed obsolete lintian override.
* Reference get-orig-source implementation for orig.tar clean-up and
  DFSG-repackaging.
* Upload to unstable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/cadxcore/CMakeLists.txt
35
35
AUX_SOURCE_DIRECTORY(main/gui/dicomdirexport SRCS)
36
36
AUX_SOURCE_DIRECTORY(main/gui/dicomdirmigration SRCS)
37
37
AUX_SOURCE_DIRECTORY(main/gui/export SRCS)
 
38
AUX_SOURCE_DIRECTORY(main/gui/ginkgocloud SRCS)
38
39
AUX_SOURCE_DIRECTORY(main/gui/history3 SRCS)
39
40
AUX_SOURCE_DIRECTORY(main/gui/hl7controlwindow SRCS)
40
41
AUX_SOURCE_DIRECTORY(main/gui/import SRCS)
76
77
AUX_SOURCE_DIRECTORY(sqlite SRCS)
77
78
ENDIF()
78
79
 
 
80
 
79
81
AUX_SOURCE_DIRECTORY(endpoint SRCS)
80
82
 
81
83
AUX_SOURCE_DIRECTORY(vtk SRCS)
133
135
        ${CMAKE_CURRENT_SOURCE_DIR}/wx/VTK
134
136
        ${CMAKE_CURRENT_SOURCE_DIR}/VTKInria3D
135
137
        ${CMAKE_CURRENT_SOURCE_DIR}/VTKInria3D/wxVTK
136
 
        ${CMAKE_CURRENT_SOURCE_DIR}/VTKInria3D/vtkRenderingAddons
137
138
        CACHE INTERNAL ""
138
139
)
139
140
 
140
141
INCLUDE_DIRECTORIES(${PROJECT_NAME} ${${PROJECT_NAME}_INCLUDE_DIR} )
141
142
 
142
143
################ LIBS ################
 
144
FIND_PATH(libjsoncpp_INCLUDE_DIR json/json.h
 
145
/usr/include/jsoncpp
 
146
)
 
147
INCLUDE_DIRECTORIES(${libjsoncpp_INCLUDE_DIR})
 
148
set(libjsoncpp_LIBRARIES jsoncpp)
 
149
MESSAGE("libjsoncpp_LIBRARIES=${libjsoncpp_LIBRARIES} libjsoncpp_INCLUDE_DIR=${libjsoncpp_INCLUDE_DIR}")
 
150
 
 
151
ADD_DEFINITIONS(${libcurl_defines})
 
152
INCLUDE_DIRECTORIES(${libcurl_INCLUDE_DIR})
 
153
LINK_DIRECTORIES(${libcurl_DIR})
 
154
#MESSAGE("LIBCURLLibx = ${libcurl_LIBRARIES} LIBCURL_include = ${libcurl_INCLUDE_DIR}  LIBCURL_LINK_DIR= ${libcurl_DIR} LIBCURL_DEFINES=${libcurl_defines}")
143
155
 
144
156
IF(USE_CUSTOM_WX)
145
157
        ADD_DEFINITIONS(${wxWidgets_defines})
254
266
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/tr/cadxcore.mo DESTINATION share/ginkgocadx/lang/tr)
255
267
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/conformance.xml DESTINATION share/ginkgocadx)
256
268
################ LIBS ################
 
269
TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${libjsoncpp_LIBRARIES})
 
270
 
 
271
TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${libcurl_LIBRARIES})
257
272
 
258
273
TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${wxWidgets_LIBRARIES})
259
274