SHS/libs
Archived
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/libs@24 a8b55f48-bf90-11e4-a774-851b48703e85

Browse Source
This commit is contained in:
Пелипенко Иван
2015-06-05 06:31:14 +00:00
parent d524235ab8
commit 454280766f
4 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
kx_tools/CMakeLists.txt
View File

@@ -30,11 +30,8 @@ if (NOT DEFINED ENV{QNX_HOST})
qt4_add_resources(RESS ${RES}) qt4_add_resources(RESS ${RES})
add_executable(kx_pult ${CPPS} ${CMOCS} ${CUIS} ${RESS}) add_executable(kx_pult ${CPPS} ${CMOCS} ${CUIS} ${RESS})
set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${PIP_LIBRARY} qad_graphic qad_utils qad_widgets kx_utils) set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${PIP_LIBRARY} qad_graphic qad_utils qad_widgets kx_utils)
if (${WIN32}) find_package(OpenGL REQUIRED)
list(APPEND LIBS opengl32 glu32) list(APPEND LIBS ${OPENGL_LIBRARIES})
else (${WIN32})
list(APPEND LIBS GL GLU)
endif (${WIN32})
target_link_libraries(kx_pult ${LIBS}) target_link_libraries(kx_pult ${LIBS})
endif () endif ()

1
make_libs.sh
View File

@@ -2,6 +2,7 @@
#make install $@ #make install $@
for d in 'qad_widgets' 'qad_utils' 'qad_graphic' 'qad_sql_table' 'qad_application' 'qad_blockview' 'touch_widgets'; do for d in 'qad_widgets' 'qad_utils' 'qad_graphic' 'qad_sql_table' 'qad_application' 'qad_blockview' 'touch_widgets'; do
cd $d cd $d
echo "now in $(pwd -P)"
qmake qmake
make install $@ make install $@
cd .. cd ..

7
qad_graphic/CMakeLists.txt
View File

@@ -16,11 +16,8 @@ qt4_wrap_cpp(CMOCS ${MOCS} "uwidget.h" "uglwidget.h" OPTIONS -nw)
qt4_add_resources(CRES ${RES}) qt4_add_resources(CRES ${RES})
add_library(qad_graphic SHARED ${CPPS} ${CUIS} ${CMOCS} ${CRES}) add_library(qad_graphic SHARED ${CPPS} ${CUIS} ${CMOCS} ${CRES})
set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} qad_widgets qad_utils) set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} qad_widgets qad_utils)
if (${WIN32}) find_package(OpenGL REQUIRED)
list(APPEND LIBS opengl32 glu32) list(APPEND LIBS ${OPENGL_LIBRARIES})
else (${WIN32})
list(APPEND LIBS GL GLU)
endif (${WIN32})
target_link_libraries(qad_graphic ${LIBS}) target_link_libraries(qad_graphic ${LIBS})
if (DEFINED LIB) if (DEFINED LIB)
set(LIB 1) set(LIB 1)

5
qad_utils/CMakeLists.txt
View File

@@ -20,11 +20,6 @@ qt4_wrap_cpp(CMOCS ${MOCS} OPTIONS -nw)
qt4_add_resources(CRES ${RES}) qt4_add_resources(CRES ${RES})
add_library(qad_utils SHARED ${CPPS} ${CUIS} ${CMOCS} ${CRES}) add_library(qad_utils SHARED ${CPPS} ${CUIS} ${CMOCS} ${CRES})
set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} qad_widgets) set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} qad_widgets)
if (${WIN32})
list(APPEND LIBS opengl32 glu32)
else (${WIN32})
list(APPEND LIBS GL GLU)
endif (${WIN32})
target_link_libraries(qad_utils ${LIBS}) target_link_libraries(qad_utils ${LIBS})
if (DEFINED LIB) if (DEFINED LIB)
set(LIB 1) set(LIB 1)