projects
/
platform
/
core
/
location
/
lbs-server.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d0745ac
8fbe62e
)
Merge branch 'sandbox/dnxowls/cmake_upgrade' into tizen
22/174722/1
accepted/tizen/unified/20180409.100041
submit/tizen/20180402.232840
submit/tizen/20180408.231339
author
Seechan, Kim
<cbible.kim@samsung.com>
Wed, 4 Apr 2018 00:40:33 +0000
(09:40 +0900)
committer
Seechan, Kim
<cbible.kim@samsung.com>
Wed, 4 Apr 2018 00:40:33 +0000
(09:40 +0900)
Conflicts:
CMakeLists.txt
Change-Id: I28a4398af49dc5b7b08e80aa3cb3e5932c0a0186
1
2
CMakeLists.txt
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
CMakeLists.txt
index
8dff516
,
847f619
..
d968ad3
---
1
/
CMakeLists.txt
---
2
/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@@
-37,8
-37,8
+37,8
@@@
ADD_DEFINITIONS("-DEXPORT_API=\"__attri
ADD_DEFINITIONS("-DLIB_DIR=\"${LIB_DIR}\"")
MESSAGE("<<< LIB_DIR=${LIB_DIR} >>>")
-MESSAGE(${CMAKE_C_FLAGS})
-#MESSAGE(${CMAKE_EXE_LINKER_FLAGS})
+MESSAGE("C Flags: ${CMAKE_C_FLAGS}")
- MESSAGE("Linker Flags: ${CMAKE_EXE_LINKER_FLAGS}")
++#MESSAGE("Linker Flags: ${CMAKE_EXE_LINKER_FLAGS}")
ADD_SUBDIRECTORY(module)
ADD_SUBDIRECTORY(lbs-server)