projects
/
platform
/
framework
/
native
/
shell.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refactoring GetSizeInfoListN()
[platform/framework/native/shell.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
old mode 100644
(file)
new mode 100755
(executable)
index
2daeaae
..
fe60831
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-7,7
+7,7
@@
SET(PREFIX ${CMAKE_INSTALL_PREFIX})
SET(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/cmake_build_tmp/output/osp)
SET(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/cmake_build_tmp/output/osp)
-## Disable build rpath
+## Disable build rpath
SET(CMAKE_SKIP_BUILD_RPATH TRUE)
IF(SBS OR OBS)
SET(CMAKE_SKIP_BUILD_RPATH TRUE)
IF(SBS OR OBS)
@@
-20,27
+20,37
@@
ENDIF(SBS)
## Set Assembly Compiler
#SET(CMAKE_ASM_COMPILER "${CMAKE_C_COMPILER}")
## Set Assembly Compiler
#SET(CMAKE_ASM_COMPILER "${CMAKE_C_COMPILER}")
-
+
SET(CMAKE_ASM_COMPILER_ARG1 "${CPPFLAGS} -c")
ENABLE_LANGUAGE(ASM)
SET(CMAKE_ASM_COMPILER_ARG1 "${CPPFLAGS} -c")
ENABLE_LANGUAGE(ASM)
-
+
## LIBRARY PATH
LINK_DIRECTORIES (${LIBRARY_OUTPUT_PATH})
ADD_SUBDIRECTORY(src)
## LIBRARY PATH
LINK_DIRECTORIES (${LIBRARY_OUTPUT_PATH})
ADD_SUBDIRECTORY(src)
+ADD_SUBDIRECTORY(src/core)
+
+ADD_DEPENDENCIES(osp-shell osp-shell-core)
+
+SET(pc_requires "osp-uifw osp-image osp-shell-core")
+SET(PC_REQUIRED ${pc_requires})
+SET(VERSION ${FULLVER})
# pkgconfig file
CONFIGURE_FILE(osp-shell.pc.in ${CMAKE_SOURCE_DIR}/osp-shell.pc @ONLY)
INSTALL(FILES ${CMAKE_SOURCE_DIR}/osp-shell.pc DESTINATION lib/pkgconfig)
# pkgconfig file
CONFIGURE_FILE(osp-shell.pc.in ${CMAKE_SOURCE_DIR}/osp-shell.pc @ONLY)
INSTALL(FILES ${CMAKE_SOURCE_DIR}/osp-shell.pc DESTINATION lib/pkgconfig)
+CONFIGURE_FILE(osp-shell-core.pc.in ${CMAKE_SOURCE_DIR}/osp-shell-core.pc @ONLY)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/osp-shell-core.pc DESTINATION lib/pkgconfig)
+
INSTALL(DIRECTORY ${LIBRARY_OUTPUT_PATH}/ DESTINATION lib/osp
INSTALL(DIRECTORY ${LIBRARY_OUTPUT_PATH}/ DESTINATION lib/osp
- FILES_MATCHING PATTERN "*.so*"
- PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
+ FILES_MATCHING PATTERN "*.so*"
+ PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
GROUP_EXECUTE GROUP_READ
WORLD_EXECUTE WORLD_READ)
GROUP_EXECUTE GROUP_READ
WORLD_EXECUTE WORLD_READ)
-INSTALL(DIRECTORY ${LIBRARY_OUTPUT_PATH}/debug/ DESTINATION lib/osp/debug
+INSTALL(DIRECTORY ${LIBRARY_OUTPUT_PATH}/debug/ DESTINATION lib/osp/debug
FILES_MATCHING PATTERN "*"
FILES_MATCHING PATTERN "*"
- PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
+ PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
GROUP_EXECUTE GROUP_READ
WORLD_EXECUTE WORLD_READ)
GROUP_EXECUTE GROUP_READ
WORLD_EXECUTE WORLD_READ)