Skip to content
This repository was archived by the owner on Jul 8, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
226 commits
Select commit Hold shift + click to select a range
0c587ce
Create appveyor.yml
NexeyaSGara Oct 31, 2017
f0996fc
Update for windows
NexeyaSGara Oct 31, 2017
4245cfa
Create cmake_win.cmake
NexeyaSGara Oct 31, 2017
a0c591c
Create cmake_win_defs.cmake
NexeyaSGara Oct 31, 2017
13ef4dc
Create cpack_win.cmake
NexeyaSGara Oct 31, 2017
4502d47
Update appveyor.yml
NexeyaSGara Nov 6, 2017
2a39adf
Update CMakeLists.txt
NexeyaSGara Nov 6, 2017
f6ef11d
Update CMakeLists.txt
NexeyaSGara Nov 6, 2017
9dcaeb9
Update CMakeLists.txt
NexeyaSGara Nov 6, 2017
05cf950
Update CMakeLists.txt
NexeyaSGara Nov 6, 2017
ff73304
Update CMakeLists.txt
NexeyaSGara Nov 6, 2017
4c1e477
Update CMakeLists.txt
NexeyaSGara Nov 6, 2017
ebd1ff8
Update CMakeLists.txt
NexeyaSGara Nov 6, 2017
16d43d9
Add windows specific
NexeyaSGara Nov 6, 2017
88030de
Update CMakeLists.txt
NexeyaSGara Nov 6, 2017
c252ee8
Add windows specific
NexeyaSGara Nov 6, 2017
e900aa2
Update CMakeLists.txt
NexeyaSGara Nov 6, 2017
301f79d
Update CMakeLists.txt
NexeyaSGara Nov 6, 2017
af0fd5b
Update CMakeLists.txt
NexeyaSGara Nov 6, 2017
7450de1
Create appveyor.yml
NexeyaSGara Oct 31, 2017
ccc108c
Update for windows
NexeyaSGara Oct 31, 2017
5fab290
Create cmake_win.cmake
NexeyaSGara Oct 31, 2017
72c396b
Create cmake_win_defs.cmake
NexeyaSGara Oct 31, 2017
e0698b0
Create cpack_win.cmake
NexeyaSGara Oct 31, 2017
2922f5c
Update appveyor.yml
NexeyaSGara Nov 6, 2017
cc0e012
Update CMakeLists.txt
NexeyaSGara Nov 6, 2017
6153f58
Update CMakeLists.txt
NexeyaSGara Nov 6, 2017
053f963
Update CMakeLists.txt
NexeyaSGara Nov 6, 2017
b92557f
Update CMakeLists.txt
NexeyaSGara Nov 6, 2017
b0b08c1
Update CMakeLists.txt
NexeyaSGara Nov 6, 2017
7229dc4
Update CMakeLists.txt
NexeyaSGara Nov 6, 2017
7551b60
Update CMakeLists.txt
NexeyaSGara Nov 6, 2017
96a87cc
Add windows specific
NexeyaSGara Nov 6, 2017
fd2c23d
Update CMakeLists.txt
NexeyaSGara Nov 6, 2017
15fa10d
Add windows specific
NexeyaSGara Nov 6, 2017
678e5d6
Update CMakeLists.txt
NexeyaSGara Nov 6, 2017
0426629
Update CMakeLists.txt
NexeyaSGara Nov 6, 2017
e72fe17
Update CMakeLists.txt
NexeyaSGara Nov 6, 2017
eaad529
Fix conflict
Nov 6, 2017
828b18c
Create appveyor.yml
NexeyaSGara Oct 31, 2017
c4be612
Update for windows
NexeyaSGara Oct 31, 2017
ee5a4dd
Create cmake_win.cmake
NexeyaSGara Oct 31, 2017
a17f166
Create cmake_win_defs.cmake
NexeyaSGara Oct 31, 2017
083ff43
Create cpack_win.cmake
NexeyaSGara Oct 31, 2017
0e24cb0
Update appveyor.yml
NexeyaSGara Nov 6, 2017
5627105
Update CMakeLists.txt
NexeyaSGara Nov 6, 2017
e7bdd39
Update CMakeLists.txt
NexeyaSGara Nov 6, 2017
af1589d
Update CMakeLists.txt
NexeyaSGara Nov 6, 2017
3ced50d
Update CMakeLists.txt
NexeyaSGara Nov 6, 2017
f0181f6
Update CMakeLists.txt
NexeyaSGara Nov 6, 2017
ec020aa
Update CMakeLists.txt
NexeyaSGara Nov 6, 2017
6b1e5d2
Update CMakeLists.txt
NexeyaSGara Nov 6, 2017
1175eeb
Add windows specific
NexeyaSGara Nov 6, 2017
52c0b1f
Update CMakeLists.txt
NexeyaSGara Nov 6, 2017
03fbc90
Add windows specific
NexeyaSGara Nov 6, 2017
febbab0
Update CMakeLists.txt
NexeyaSGara Nov 6, 2017
b194162
Update CMakeLists.txt
NexeyaSGara Nov 6, 2017
8eefcaa
Update CMakeLists.txt
NexeyaSGara Nov 6, 2017
7a8202a
Create appveyor.yml
NexeyaSGara Oct 31, 2017
aeed23c
Update for windows
NexeyaSGara Oct 31, 2017
e0744e7
Update CMakeLists.txt
NexeyaSGara Nov 6, 2017
5c9b09d
Update CMakeLists.txt
NexeyaSGara Nov 6, 2017
faecceb
Fix conflict
Nov 6, 2017
6e4d70d
Update CMakeLists.txt
NexeyaSGara Nov 6, 2017
71de138
fix not by !
NexeyaSGara Nov 6, 2017
5c1743b
Fix remaining not
NexeyaSGara Nov 6, 2017
ff6cc48
Fix remaining not by !
NexeyaSGara Nov 6, 2017
18ef4f0
Fix remaning not by !
NexeyaSGara Nov 6, 2017
acc91d4
Fix not by !
NexeyaSGara Nov 6, 2017
3f44894
Create resource.h
NexeyaSGara Nov 6, 2017
3208dff
Update tango.h
NexeyaSGara Nov 6, 2017
7fefc6a
add algorithm for windows
NexeyaSGara Nov 6, 2017
8869e9e
Chn
NexeyaSGara Nov 6, 2017
c356eaf
Add fix for windows timeval
NexeyaSGara Nov 6, 2017
fe8e045
Change zmq to 4.0.5
NexeyaSGara Nov 6, 2017
70ae036
disable warning 4267 4244 on windows
NexeyaSGara Nov 6, 2017
39db9c5
Update cmake_win_defs.cmake
NexeyaSGara Nov 6, 2017
cd5fc3e
Update cmake_win_defs.cmake
NexeyaSGara Nov 6, 2017
5aed66b
Update cmake_win_defs.cmake
NexeyaSGara Nov 6, 2017
56dc194
add windows def
NexeyaSGara Nov 7, 2017
0fa1351
Update cmake_win_defs.cmake
NexeyaSGara Nov 7, 2017
d80341e
Update cmake_win.cmake
NexeyaSGara Nov 7, 2017
73846b5
Update cmake_win.cmake
NexeyaSGara Nov 7, 2017
9d298d5
Update utils.cpp
NexeyaSGara Nov 7, 2017
ec670d3
Update utils.cpp
NexeyaSGara Nov 7, 2017
6db172f
Update CMakeLists.txt
NexeyaSGara Nov 7, 2017
791224d
Update clock.hh
NexeyaSGara Nov 7, 2017
7461f22
Update cxx_nan_inf_in_prop.cpp
NexeyaSGara Nov 7, 2017
ff4fb19
Update CMakeLists.txt
NexeyaSGara Nov 7, 2017
d6a7fed
Update cmake_win.cmake
NexeyaSGara Nov 7, 2017
727479b
Update cmake_win.cmake
NexeyaSGara Nov 7, 2017
d3a3e10
Update cmake_win.cmake
NexeyaSGara Nov 7, 2017
234a1f4
Update CMakeLists.txt
NexeyaSGara Nov 7, 2017
559e017
Update cmake_win.cmake
NexeyaSGara Nov 7, 2017
7eb3d9d
Update CMakeLists.txt
NexeyaSGara Nov 7, 2017
f101053
Update cmake_win.cmake
NexeyaSGara Nov 7, 2017
1473240
Update CMakeLists.txt
NexeyaSGara Nov 7, 2017
df3e8c6
Update cmake_win.cmake
NexeyaSGara Nov 7, 2017
b037f80
Update CMakeLists.txt
NexeyaSGara Nov 7, 2017
eff8b79
Update CMakeLists.txt
NexeyaSGara Nov 7, 2017
7881bda
Update zmq version
NexeyaSGara Nov 7, 2017
cc955ac
Update cmake_win.cmake
NexeyaSGara Nov 7, 2017
e63a875
new zmq version
NexeyaSGara Nov 7, 2017
81265d4
update zmq + disable nsis
NexeyaSGara Nov 7, 2017
5c40e7d
Update appveyor.yml
NexeyaSGara Nov 8, 2017
5b011b4
Update cmake_win.cmake
NexeyaSGara Nov 8, 2017
7be2753
Update cmake_win.cmake
NexeyaSGara Nov 8, 2017
09966d0
Update cmake_win.cmake
NexeyaSGara Nov 8, 2017
2231bdc
New zmq version (fix vc9 x64)
NexeyaSGara Nov 8, 2017
326397d
Fix files installed
NexeyaSGara Nov 8, 2017
4b0a303
Fix pattern files_matching
NexeyaSGara Nov 8, 2017
337e7a1
Re fix install structure
NexeyaSGara Nov 8, 2017
a128316
Add tpp
NexeyaSGara Nov 8, 2017
5ca3d8c
Retrying CPACK
NexeyaSGara Nov 8, 2017
bf80dd5
Create dummy fille for creating directory
NexeyaSGara Nov 8, 2017
379ba81
Add Tango.ico for NSIS Windows installer
NexeyaSGara Nov 8, 2017
790af02
remove dummy
NexeyaSGara Nov 8, 2017
f1e5898
Upload executables Setup
NexeyaSGara Nov 8, 2017
3d62ab9
Fix typo tango version x64 vc14
NexeyaSGara Nov 9, 2017
71ea34e
Fix order for target compile options
NexeyaSGara Nov 9, 2017
11ea4d1
Fix bad copy from master
NexeyaSGara Nov 9, 2017
c516ee0
Update to zmq (fix dyn lib asking libzmq.dll instead of libzmq-vcXX-m…
NexeyaSGara Nov 9, 2017
74223c6
Change perform_work method
NexeyaSGara Nov 9, 2017
f71c07c
Update cmake_win_defs.cmake
NexeyaSGara Nov 9, 2017
1ef36ad
Try static omniorb
NexeyaSGara Nov 9, 2017
df5c26c
Update zmq
NexeyaSGara Nov 9, 2017
52a240f
Fix x64 msvc12 link
NexeyaSGara Nov 9, 2017
3e0d15e
Update cmake_win.cmake
NexeyaSGara Nov 9, 2017
5d19a5e
Try to fix vc14 def to add
NexeyaSGara Nov 10, 2017
56e9410
vc14 x64 first
NexeyaSGara Nov 10, 2017
e2bbe92
Update cmake_win.cmake
NexeyaSGara Nov 10, 2017
428063f
Update cmake_win.cmake
NexeyaSGara Nov 10, 2017
89057c5
Update cmake_win_defs.cmake
NexeyaSGara Nov 10, 2017
dcf46a3
Update cmake_win_defs.cmake
NexeyaSGara Nov 10, 2017
a350761
Update cmake_win.cmake
NexeyaSGara Nov 10, 2017
86c642b
Update cmake_win_defs.cmake
NexeyaSGara Nov 10, 2017
9e1559b
Add compile options before library
NexeyaSGara Nov 13, 2017
ab4f55c
Trying to apply defs
NexeyaSGara Nov 13, 2017
c5d141c
Trying another fix for the differents definitions on static and dynamic
NexeyaSGara Nov 13, 2017
609612f
Update cmake_win.cmake
NexeyaSGara Nov 13, 2017
b07f85e
Update cmake_win.cmake
NexeyaSGara Nov 13, 2017
f68f8b7
Add list of def for static and dyn
NexeyaSGara Nov 13, 2017
6cb558f
Compile in static and dynamic for windows
NexeyaSGara Nov 13, 2017
0866f08
Compile in static and dynamic for windows
NexeyaSGara Nov 13, 2017
90ba10a
Compile in static and dynamic for windows
NexeyaSGara Nov 13, 2017
5237bdf
Compile in static and dynamic for windows
NexeyaSGara Nov 13, 2017
25a8a9a
Compile in static and dynamic for windows
NexeyaSGara Nov 13, 2017
86177c9
Compile in static and dynamic for windows
NexeyaSGara Nov 13, 2017
c0c1d68
Use differents temp objets for sta and dyn
NexeyaSGara Nov 13, 2017
efb0f06
Add dyn and sta for windows
NexeyaSGara Nov 13, 2017
fcfbcc9
Update CMakeLists.txt
NexeyaSGara Nov 13, 2017
6f98c75
Update CMakeLists.txt
NexeyaSGara Nov 13, 2017
fe4fd51
Update CMakeLists.txt
NexeyaSGara Nov 13, 2017
6d512ac
Update CMakeLists.txt
NexeyaSGara Nov 13, 2017
6929df9
Update CMakeLists.txt
NexeyaSGara Nov 13, 2017
66b3788
Update CMakeLists.txt
NexeyaSGara Nov 13, 2017
05ad1b3
Update CMakeLists.txt
NexeyaSGara Nov 13, 2017
d186213
Update cmake_win.cmake
NexeyaSGara Nov 13, 2017
fb1d87e
Update CMakeLists.txt
NexeyaSGara Nov 13, 2017
c3769bc
Update appveyor.yml
NexeyaSGara Nov 13, 2017
3f62ed2
Update cmake_win_defs.cmake
NexeyaSGara Nov 13, 2017
31251f3
Update cmake_win_defs.cmake
NexeyaSGara Nov 13, 2017
9678c2b
Update cmake_win_defs.cmake
NexeyaSGara Nov 13, 2017
557624e
Update cmake_win_defs.cmake
NexeyaSGara Nov 13, 2017
a3833d4
Update appveyor.yml
NexeyaSGara Nov 13, 2017
6dc4f57
Update zmq (fix x64 static)
NexeyaSGara Nov 14, 2017
73d60ed
Use new builded pthreadwin32
NexeyaSGara Nov 15, 2017
c067349
Adding pthread_win static and dynamic
NexeyaSGara Nov 15, 2017
125a1fa
Using dyn and sta for pthread_win
NexeyaSGara Nov 15, 2017
7d118e5
Update cmake_win.cmake
NexeyaSGara Nov 15, 2017
3d3c8d2
Update appveyor.yml
NexeyaSGara Nov 15, 2017
3e0f602
Update cmake_win_defs.cmake
NexeyaSGara Nov 17, 2017
35c16c2
add pdb
NexeyaSGara Nov 17, 2017
1bce8a5
Update CMakeLists.txt
NexeyaSGara Nov 17, 2017
e9898d7
Update Omniorb
NexeyaSGara Nov 17, 2017
fd1de23
Update CMakeLists.txt
NexeyaSGara Nov 17, 2017
4840bab
Update CMakeLists.txt
NexeyaSGara Nov 17, 2017
b68f703
Update utils.cpp
NexeyaSGara Nov 17, 2017
d40b10b
Add MT for sta
NexeyaSGara Nov 21, 2017
de4a481
Add /MT for static
NexeyaSGara Nov 21, 2017
8b8c30b
Add /MT for static
NexeyaSGara Nov 21, 2017
f9b4938
Add missing /MT for static
NexeyaSGara Nov 21, 2017
b3b3217
Add /MT for static
NexeyaSGara Nov 21, 2017
48e8447
Add /MT for static
NexeyaSGara Nov 21, 2017
ab70094
fix bad copy
NexeyaSGara Nov 21, 2017
0000a53
add /MT for static
NexeyaSGara Nov 21, 2017
feaabc7
fix bad copy
NexeyaSGara Nov 21, 2017
f50fe72
Update CMakeLists.txt
NexeyaSGara Nov 21, 2017
7084ff9
Add /MT for static
NexeyaSGara Nov 21, 2017
21068fc
Fix zmq naming static
NexeyaSGara Nov 21, 2017
f30bc06
Update zmq version (/MT static)
NexeyaSGara Nov 21, 2017
5157d28
Fix zmq naming
NexeyaSGara Nov 21, 2017
a9120e0
/MTd for debug
NexeyaSGara Nov 21, 2017
74586f6
/MTd for debug
NexeyaSGara Nov 21, 2017
6561edf
MTd for debug
NexeyaSGara Nov 21, 2017
0a52322
MTd for debug
NexeyaSGara Nov 21, 2017
e7c045e
MTd for debug
NexeyaSGara Nov 21, 2017
0080edc
MTd for debug
NexeyaSGara Nov 21, 2017
46312ae
MTd for debug
NexeyaSGara Nov 21, 2017
a803b43
MTd for debug
NexeyaSGara Nov 21, 2017
e85543b
Re-adding test on linux
NexeyaSGara Nov 24, 2017
cc9526e
Remove 64 sepcific since it's the same
NexeyaSGara Nov 24, 2017
99a03f4
Update CMakeLists.txt
NexeyaSGara Nov 24, 2017
f7a8ac6
Add comment for new pragma warning
NexeyaSGara Nov 24, 2017
52aafaa
removing \n
NexeyaSGara Nov 24, 2017
8200729
Revert modif for windows
NexeyaSGara Nov 24, 2017
84e4666
Removing ENV
NexeyaSGara Nov 24, 2017
151f67b
Removing Test for windows
NexeyaSGara Nov 24, 2017
6dd6c14
Update clock.hh
NexeyaSGara Nov 24, 2017
e4f76e4
Update CMakeLists.txt
NexeyaSGara Nov 24, 2017
ca89e8e
Reverting changes
NexeyaSGara Nov 24, 2017
2c5d575
Replace RELEASE with Release
bourtemb Nov 24, 2017
0cae502
Update README.md and INSTALL.md
bourtemb Nov 27, 2017
8be0f59
Fix indentation on CMake files
bourtemb Nov 27, 2017
8eba956
Add/Fix indentation in .cmake files
bourtemb Nov 28, 2017
4a40f3b
Fix indentation
bourtemb Nov 28, 2017
6a450c0
Fix indentation in configure/cmake_win.cmake
bourtemb Nov 28, 2017
130349a
Change packagin
NexeyaSGara Nov 30, 2017
e998a93
Trying to fix the long path problem
NexeyaSGara Dec 1, 2017
560bfce
Fix download of nsis
NexeyaSGara Dec 1, 2017
4b40111
Update appveyor.yml
NexeyaSGara Dec 1, 2017
ef3244b
Update appveyor.yml
NexeyaSGara Dec 1, 2017
14c4d1e
Adding Wix specific
NexeyaSGara Dec 4, 2017
9c1519a
Trying WIX for generating setup
NexeyaSGara Dec 4, 2017
01d7615
Update cpack_win.cmake
NexeyaSGara Dec 4, 2017
14f4a38
Update appveyor.yml
NexeyaSGara Dec 4, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 46 additions & 27 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
cmake_minimum_required(VERSION 2.8)
project(libtango)
include(CTest)

enable_testing()
Expand All @@ -8,11 +7,14 @@ set(MAJOR_VERSION "9")
set(MINOR_VERSION "2")
set(PATCH_VERSION "6")

if(WIN32)
include(configure/cmake_win_defs.cmake)
endif(WIN32)

#convenient versions
set(LIBRARY_VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}")
set(SO_VERSION "${MAJOR_VERSION}")


message("System TANGO_HOST=$ENV{TANGO_HOST}")
set(TANGO_HOST $ENV{TANGO_HOST})
include(configure/CMakeLists.txt)
Expand All @@ -29,28 +31,45 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}/log4tango/include)
#source code
add_subdirectory("log4tango")
add_subdirectory("cppapi")
add_subdirectory("cpp_test_suite")

add_library(tango SHARED $<TARGET_OBJECTS:log4tango_objects>
$<TARGET_OBJECTS:client_objects>
$<TARGET_OBJECTS:idl_objects>
$<TARGET_OBJECTS:jpeg_objects>
$<TARGET_OBJECTS:jpeg_mmx_objects>
$<TARGET_OBJECTS:server_objects>)
target_include_directories(tango PUBLIC ${ZMQ_PKG_INCLUDE_DIRS} ${OMNIORB_PKG_INCLUDE_DIRS} ${OMNIDYN_PKG_INCLUDE_DIRS})
target_link_libraries(tango PUBLIC ${ZMQ_PKG_LIBRARIES} ${OMNIORB_PKG_LIBRARIES} ${OMNICOS_PKG_LIBRARIES} ${OMNIDYN_PKG_LIBRARIES})
target_compile_options(tango PUBLIC ${ZMQ_PKG_CFLAGS_OTHER} ${OMNIORB_PKG_CFLAGS_OTHER} ${OMNICOS_PKG_CFLAGS_OTHER} ${OMNIDYN_PKG_CFLAGS_OTHER})
target_compile_options(tango PRIVATE -fPIC)
target_compile_definitions(tango PRIVATE OMNI_UNLOADABLE_STUBS _TANGO_LIB)

set_target_properties(tango PROPERTIES
VERSION ${LIBRARY_VERSION}
SOVERSION ${SO_VERSION})

#install code
install(TARGETS tango LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}")

configure_file(tango.pc.cmake tango.pc @ONLY)

install(FILES "${CMAKE_CURRENT_BINARY_DIR}/tango.pc"
DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")
if(NOT WIN32)
add_subdirectory("cpp_test_suite")
endif(NOT WIN32)

if(WIN32)
include(configure/cmake_win.cmake)
else(WIN32)
add_library(tango SHARED $<TARGET_OBJECTS:log4tango_objects>
$<TARGET_OBJECTS:client_objects>
$<TARGET_OBJECTS:idl_objects>
$<TARGET_OBJECTS:jpeg_objects>
$<TARGET_OBJECTS:jpeg_mmx_objects>
$<TARGET_OBJECTS:server_objects>)
target_link_libraries(tango PUBLIC ${ZMQ_PKG_LIBRARIES} ${OMNIORB_PKG_LIBRARIES} ${OMNICOS_PKG_LIBRARIES} ${OMNIDYN_PKG_LIBRARIES} ${CMAKE_DL_LIBS})
target_compile_options(tango PRIVATE -fPIC)
target_include_directories(tango PUBLIC ${ZMQ_PKG_INCLUDE_DIRS} ${OMNIORB_PKG_INCLUDE_DIRS} ${OMNIDYN_PKG_INCLUDE_DIRS})

target_compile_options(tango PUBLIC ${ZMQ_PKG_CFLAGS_OTHER} ${OMNIORB_PKG_CFLAGS_OTHER} ${OMNICOS_PKG_CFLAGS_OTHER} ${OMNIDYN_PKG_CFLAGS_OTHER})
target_compile_definitions(tango PRIVATE OMNI_UNLOADABLE_STUBS _TANGO_LIB)

set_target_properties(tango PROPERTIES
VERSION ${LIBRARY_VERSION}
SOVERSION ${SO_VERSION})

install(TARGETS tango LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}")
configure_file(tango.pc.cmake tango.pc @ONLY)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/tango.pc"
DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")
endif(WIN32)


if(WIN32)
include(configure/cpack_win.cmake)
else(WIN32)
set(CPACK_GENERATOR "DEB")
set(CPACK_DEBIAN_PACKAGE_NAME libtango-dev)
set(CPACK_DEBIAN_PACKAGE_VERSION ${LIBRARY_VERSION})
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libcos4-dev, libzmq5-dev | libzmq3-dev")
set(CPACK_DEBIAN_PACKAGE_CONFLICTS "libtango7-dev, libtango8-dev, libtango9-dev")
set(CPACK_DEBIAN_PACKAGE_MAINTAINER "TANGO team <tango@esrf.fr>") #required
endif(WIN32)
include(CPack)
4 changes: 2 additions & 2 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
- make [-j NUMBER_OF_CPUS]
- sudo make install

cmake options are: `[-DCMAKE_INSTALL_PREFIX=<desired installation path>] [-DOMNI_BASE=<omniORB4 home folder>] [-DZMQ_BASE=<zmq home folder>] [-DIDL_BASE=<tango-idl installation folder>] [-DCMAKE_BUILD_TYPE=RELEASE|DEBUG] [-DCMAKE_VERBOSE_MAKEFILE=true]`
cmake options are: `[-DCMAKE_INSTALL_PREFIX=<desired installation path>] [-DOMNI_BASE=<omniORB4 home folder>] [-DZMQ_BASE=<zmq home folder>] [-DIDL_BASE=<tango-idl installation folder>] [-DCMAKE_BUILD_TYPE=Release|Debug] [-DCMAKE_VERBOSE_MAKEFILE=true]`

Typical output:

```
-- Install configuration: "DEBUG"
-- Install configuration: "Debug"
-- Installing: /storage/Projects/org.tango/git/cppTango/build/install/lib/libtango.so.9.2.5
-- Installing: /storage/Projects/org.tango/git/cppTango/build/install/lib/libtango.so.9
-- Installing: /storage/Projects/org.tango/git/cppTango/build/install/lib/libtango.so
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Manuals: [tango-controls.org/resources/documentation/kernel](http://www.tango-co

# How to build and install using cmake

`mkdir build; cd build; cmake .. [-DCMAKE_INSTALL_PREFIX=<desired installation path>] [-DOMNI_BASE=<omniORB4 home folder>] [-DZMQ_BASE=<zmq home folder>] [-DCMAKE_BUILD_TYPE=RELEASE|DEBUG] [-DCMAKE_VERBOSE_MAKEFILE=true]; make; make install`
`mkdir build; cd build; cmake .. [-DCMAKE_INSTALL_PREFIX=<desired installation path>] [-DOMNI_BASE=<omniORB4 home folder>] [-DZMQ_BASE=<zmq home folder>] [-DCMAKE_BUILD_TYPE=Release|Debug] [-DCMAKE_VERBOSE_MAKEFILE=true]; make; make install`

More information is in [INSTALL file](https://github.com/tango-controls/cppTango/blob/tango-9-lts/INSTALL.md)

Expand Down
252 changes: 252 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,252 @@
version: 0.0.{build}
branches:
only:
- tango-9-lts

image: Visual Studio 2015

environment:
matrix:
- platform: win32
ARCH: win32-msvc9
configuration: Release
CMAKE_GENERATOR: "Visual Studio 9 2008"
MSVCVERSION: v90
MSVCYEAR: "vs2008"
MSVCABR: "9"
VC_VER: 9.0
PYTHONPATHOMNI: "/cygdrive/c/Python27/python"
BOOST_ROOT: C:\Libraries\boost_1_63_0
ZMQ_BASE: C:\projects\libzmq
IDL_BASE: C:\projects\tangoidl
IDL_BIN: C:\Program Files (x86)\tangoidl
OMNI_BASE: C:\projects\omniORB-4.2.1
- platform: x64
ARCH: x64-msvc9
configuration: Release
CMAKE_GENERATOR: "Visual Studio 9 2008 Win64"
MSVCVERSION: v90
MSVCYEAR: "vs2008"
MSVCABR: "9"
VC_VER: 9.0
PYTHONPATHOMNI: "/cygdrive/c/Python27/python"
BOOST_ROOT: C:\Libraries\boost_1_63_0
ZMQ_BASE: C:\projects\libzmq
IDL_BASE: C:\projects\tangoidl
IDL_BIN: C:\Program Files\tangoidl
OMNI_BASE: C:\projects\omniORB-4.2.1
- platform: win32
ARCH: win32-msvc10
configuration: Release
CMAKE_GENERATOR: "Visual Studio 10 2010"
MSVCVERSION: v100
MSVCYEAR: "vs2010"
MSVCABR: "10"
VC_VER: 10.0
PYTHONPATH: c:\Python33\
PYTHONPATHOMNI: "/cygdrive/c/Python33/python"
BOOST_ROOT: C:\Libraries\boost_1_63_0
ZMQ_BASE: C:\projects\libzmq
IDL_BASE: C:\projects\tangoidl
IDL_BIN: C:\Program Files (x86)\tangoidl
OMNI_BASE: C:\projects\omniORB-4.2.1
- platform: x64
ARCH: x64-msvc10
configuration: Release
CMAKE_GENERATOR: "Visual Studio 10 2010 Win64"
MSVCVERSION: v100
MSVCYEAR: "vs2010"
MSVCABR: "10"
VC_VER: 10.0
PYTHONPATH: c:\Python33-x64\
PYTHONPATHOMNI: "/cygdrive/c/Python33-x64/python"
BOOST_ROOT: C:\Libraries\boost_1_63_0
ZMQ_BASE: C:\projects\libzmq
IDL_BASE: C:\projects\tangoidl
IDL_BIN: C:\Program Files\tangoidl
OMNI_BASE: C:\projects\omniORB-4.2.1
- platform: x64
ARCH: x64-msvc12
configuration: Release
CMAKE_GENERATOR: "Visual Studio 12 2013 Win64"
MSVCVERSION: v120
MSVCYEAR: "vs2013"
MSVCABR: "13"
VC_VER: 13.0
PYTHONPATHOMNI: "/cygdrive/c/Python33-x64/python"
BOOST_ROOT: C:\Libraries\boost_1_63_0
ZMQ_BASE: C:\projects\libzmq
IDL_BASE: C:\projects\tangoidl
IDL_BIN: C:\Program Files\tangoidl
OMNI_BASE: C:\projects\omniORB-4.2.1
- platform: x64
ARCH: x64-msvc14
configuration: Release
CMAKE_GENERATOR: "Visual Studio 14 2015 Win64"
MSVCVERSION: v140
MSVCYEAR: "vs2015"
MSVCABR: "14"
VC_VER: 14.0
PYTHONPATH: c:\Python35-x64\
PYTHONPATHOMNI: "/cygdrive/c/Python35-x64/python"
BOOST_ROOT: C:\Libraries\boost_1_63_0
ZMQ_BASE: C:\projects\libzmq
IDL_BASE: C:\projects\tangoidl
IDL_BIN: C:\Program Files\tangoidl
OMNI_BASE: C:\projects\omniORB-4.2.1

init:
# go to hell Xamarin (see http://help.appveyor.com/discussions/problems/4569)
- del "C:\Program Files (x86)\MSBuild\4.0\Microsoft.Common.Targets\ImportAfter\Xamarin.Common.targets"
- del "C:\Program Files (x86)\MSBuild\14.0\Microsoft.Common.targets\ImportAfter\Xamarin.Common.targets"
- del "C:\Program Files (x86)\MSBuild\12.0\Microsoft.Common.targets\ImportAfter\Xamarin.Common.targets"
#RDP from start
#- ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
# Update NSIS to support long path
- ps: (new-object System.Net.WebClient).DownloadFile("https://downloads.sourceforge.net/project/nsis/NSIS%203/3.02.1/nsis-3.02.1-strlen_8192.zip?r=&ts=1512138514&use_mirror=10gbps-io", "C:\projects\nsis-3.02.1-strlen_8192.zip")
- cmd: cd "C:\projects\"
- cmd: 7z -y x nsis-3.02.1-strlen_8192.zip -oC:\Program Files (x86)\NSIS
# Tango IDL
- cmd: set TANGOIDLDIR=C:\projects\tangoidl
- cmd: git clone --depth 1 --quiet https://github.com/tango-controls/tango-idl %TANGOIDLDIR%
- cmd: cd "C:\projects\"
# Zmq
- cmd: cd "C:\projects\"
- cmd: md zeromq
- cmd: cd "C:\projects\"
- if %ARCH%==win32-msvc9 appveyor DownloadFile https://ci.appveyor.com/api/buildjobs/kif9t1ni9dorv7ai/artifacts/zmq-4.0.5_%ARCH%.zip
- if %ARCH%==x64-msvc9 appveyor DownloadFile https://ci.appveyor.com/api/buildjobs/v08rh5ojx3uljbm0/artifacts/zmq-4.0.5_%ARCH%.zip
- if %ARCH%==win32-msvc10 appveyor DownloadFile https://ci.appveyor.com/api/buildjobs/bfw1w51dmwb4t1s8/artifacts/zmq-4.0.5_%ARCH%.zip
- if %ARCH%==x64-msvc10 appveyor DownloadFile https://ci.appveyor.com/api/buildjobs/dv6koti648n78wru/artifacts/zmq-4.0.5_%ARCH%.zip
- if %ARCH%==x64-msvc12 appveyor DownloadFile https://ci.appveyor.com/api/buildjobs/92i5i0466vrsf8uf/artifacts/zmq-4.0.5_%ARCH%.zip
- if %ARCH%==x64-msvc14 appveyor DownloadFile https://ci.appveyor.com/api/buildjobs/jlsd4d38c425kumq/artifacts/zmq-4.0.5_%ARCH%.zip
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As we said during the last Tango kernel teleconference, the repositories to build ZMQ and omniORB should be on GitHub tango-controls organization so we could have full control on how to build these artifacts.
This can be done eventually after accepting this PR. But another PR will be necesseray in order to update all these download links.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think so, for the moment, theses artefacts are OK. We will just update them when you will have all setted up

Copy link
Copy Markdown
Member

@bourtemb bourtemb Nov 24, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I get this CMake warning with your change:
CMake Warning (dev) in CMakeLists.txt:
A logical block opening on the line
cppTango/CMakeLists.txt:34 (if)
closes on the line
cppTango/CMakeLists.txt:36 (endif)
with mis-matching arguments.

endif(WIN32) should be replaced with endif(NOT WIN32) in this case.

Ooops wrong location for this comment. This comment is about the commit which added the tests on Linux again.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

- cmd: 7z -y x zmq-4.0.5_%ARCH%.zip -oC:\projects\zeromq\
#- cmd: move C:\projects\zeromq\lib\Release\libzmq*mt-4*.lib C:\projects\zeromq\lib\Release\libzmq.lib
# OmniOrb
- cmd: cd "C:\projects\"
- cmd: md omniorb
- cmd: cd "C:\projects\"
- if %ARCH%==win32-msvc9 appveyor DownloadFile https://ci.appveyor.com/api/buildjobs/b3j87c59nps33ga8/artifacts/omniorb-4.2.1_%ARCH%.zip
- if %ARCH%==x64-msvc9 appveyor DownloadFile https://ci.appveyor.com/api/buildjobs/t0c9a59fr0ixb6to/artifacts/omniorb-4.2.1_%ARCH%.zip
- if %ARCH%==win32-msvc10 appveyor DownloadFile https://ci.appveyor.com/api/buildjobs/0ywhsy2wnmfw99ia/artifacts/omniorb-4.2.1_%ARCH%.zip
- if %ARCH%==x64-msvc10 appveyor DownloadFile https://ci.appveyor.com/api/buildjobs/x2sr2c1i0f7hy1cg/artifacts/omniorb-4.2.1_%ARCH%.zip
- if %ARCH%==x64-msvc12 appveyor DownloadFile https://ci.appveyor.com/api/buildjobs/2e8wjs2aalg6cryl/artifacts/omniorb-4.2.1_%ARCH%.zip
- if %ARCH%==x64-msvc14 appveyor DownloadFile https://ci.appveyor.com/api/buildjobs/ry9yevfyjddf6j2e/artifacts/omniorb-4.2.1_%ARCH%.zip
- cmd: 7z -y x omniorb-4.2.1_%ARCH%.zip -oC:\projects\omniorb\
#Pthread-Win32
- cmd: cd "C:\projects\"
- cmd: md pthreads-win32
- cmd: cd "C:\projects\"
- if %ARCH%==win32-msvc9 appveyor DownloadFile https://ci.appveyor.com/api/buildjobs/7aj99tp6e6fvron0/artifacts/pthreads-win32-2.9.1_win32-msvc9.zip
- if %ARCH%==x64-msvc9 appveyor DownloadFile https://ci.appveyor.com/api/buildjobs/pgefsid2t7ma16j6/artifacts/pthreads-win32-2.9.1_x64-msvc9.zip
- if %ARCH%==win32-msvc10 appveyor DownloadFile https://ci.appveyor.com/api/buildjobs/3hhh3rfhif1lgw0f/artifacts/pthreads-win32-2.9.1_win32-msvc10.zip
- if %ARCH%==x64-msvc10 appveyor DownloadFile https://ci.appveyor.com/api/buildjobs/g6g73i5paldagoc4/artifacts/pthreads-win32-2.9.1_x64-msvc10.zip
- if %ARCH%==x64-msvc12 appveyor DownloadFile https://ci.appveyor.com/api/buildjobs/w4vojpste8j6l823/artifacts/pthreads-win32-2.9.1_x64-msvc12.zip
- if %ARCH%==x64-msvc14 appveyor DownloadFile https://ci.appveyor.com/api/buildjobs/6tson2rjxm3vgwra/artifacts/pthreads-win32-2.9.1_x64-msvc14.zip
- cmd: 7z -y x pthreads-win32-2.9.1_%ARCH%.zip -oC:\projects\pthreads-win32\
#VS2008 patch
- cmd: cd "C:\projects\"
- cmd: appveyor DownloadFile https://github.com/menpo/condaci/raw/master/vs2008_patch.zip
- cmd: 7z -y x vs2008_patch.zip -oC:\projects\vs2008_patch\
- cmd: if %ARCH%==x64-msvc9 call C:\projects\vs2008_patch\setup_x64.bat
- cmd: if %ARCH%==x32-msvc9 call C:\projects\vs2008_patch\setup_x86.bat
- cmd: copy "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\vcvars64.bat" "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\amd64\vcvarsamd64.bat"

- cmd: cd "C:\projects\cppTango"
install:
#copy tree for debug build
- cmd: cd c:/projects/
- cmd: md debug_build
- cmd: xcopy "C:/projects/cppTango" "c:/projects/debug_build" /c /g /d /i /e /r /h /y
# Setting Visual Compiler
- cmd: cd "C:\projects\"
- cmd: if %ARCH%==win32-msvc9 call "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\vcvarsall.bat"
- cmd: if %ARCH%==win32-msvc9 set path=C:\Windows\Microsoft.NET\Framework\v4.0.30319;%path%
- cmd: if %ARCH%==x64-msvc9 call "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\vcvars64.bat"
- cmd: if %ARCH%==win32-msvc10 call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat"
- cmd: if %ARCH%==win32-msvc10 set path=C:\Windows\Microsoft.NET\Framework\v4.0.30319;%path%
- cmd: if %ARCH%==x64-msvc10 call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64
- cmd: if %ARCH%==win32-msvc14 call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"
- cmd: if %ARCH%==x64-msvc14 call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64
- cmd: echo "Generator='%CMAKE_GENERATOR%'"
- cmd: echo "Platform='%Platform%'"
- cmd: set PYTHONPATH=%PYTHONPATH%
# Tango IDL
- cmd: cd "C:\projects\tangoidl"
- cmd: cmake -G "%CMAKE_GENERATOR%"
- cmd: cmake --build ./ --target install --config Debug
- cmd: if %ARCH%==x64-msvc10 call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 /Release
- cmd: cmake --build ./ --target install --config Release
# Tango API
- cmd: cd "C:\projects\cppTango"
- cmd: set BOOST_ROOT=%BOOST_ROOT%
- cmd: set ZMQ_BASE=C:/projects/zeromq/
- cmd: set IDL_BASE=%IDL_BIN%
- cmd: set OMNI_BASE=C:/projects/omniorb/
- cmd: set PTHREAD_WIN=C:/projects/pthreads-win32/
- cmd: if %ARCH%==x64-msvc14 set path=%path%;%PYTHONPATH%
#- cmd: cmake -G "%CMAKE_GENERATOR%" -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE -DBUILD_SHARED_LIBS=TRUE
#- cmd: cmake -G "%CMAKE_GENERATOR%" -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE
- cmd: cmake -G "%CMAKE_GENERATOR%" -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE -DIDL_BASE="%IDL_BASE%" -DOMNI_BASE="%OMNI_BASE%" -DZMQ_BASE="%ZMQ_BASE%" -DPTHREAD_WIN=%PTHREAD_WIN%
- cmd: cd c:/projects/debug_build
#- cmd: cmake -G "%CMAKE_GENERATOR%" -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE -DBUILD_SHARED_LIBS=TRUE -DCMAKE_BUILD_TYPE=Debug
- cmd: cmake -G "%CMAKE_GENERATOR%" -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE -DCMAKE_BUILD_TYPE=Debug -DIDL_BASE="%IDL_BASE%" -DOMNI_BASE="%OMNI_BASE%" -DZMQ_BASE="%ZMQ_BASE%" -DPTHREAD_WIN=%PTHREAD_WIN%

clone_folder: C:\projects\cppTango

build:
project: C:\projects\cppTango\tango.sln
verbosity: minimal

build_script:
- cmd: cd C:/projects/cppTango
- cmake --build ./ --config Release
- cmd: if %ARCH%==x64-msvc10 call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64
- cmd: cd c:/projects/debug_build
- cmake --build ./ --config Debug
#- cmake --build ./ --target install --config Debug


after_build:
- cmd: cd C:/projects/cppTango
# Generating installer
- cmd: cpack -G WIX
- cmd: cpack -G ZIP
- cmd: cd c:/projects/debug_build
# Generating installer
- cmd: cpack -C Debug -G WIX
- cmd: cpack -C Debug -G ZIP
#rename x64-msvc10
- cmd: if %ARCH%==x64-msvc10 move libtango_9.2.6_Windows7.1SDK_x64_debug.msi libtango_9.2.6_v100_x64_debug.msi
- cmd: if %ARCH%==x64-msvc10 move libtango_9.2.6_Windows7.1SDK_x64_debug.zip libtango_9.2.6_v100_x64_debug.zip
- cmd: cd C:/projects/cppTango
- cmd: if %ARCH%==x64-msvc10 move libtango_9.2.6_Windows7.1SDK_x64.msi libtango_9.2.6_v100_x64.msi
- cmd: if %ARCH%==x64-msvc10 move libtango_9.2.6_Windows7.1SDK_x64.zip libtango_9.2.6_v100_x64.zip
# copying debug versions for upload
- cmd: cd c:/projects/debug_build
- cmd: if %ARCH%==win32-msvc9 move libtango_9.2.6_v90_x86_debug.msi C:/projects/cppTango
- cmd: if %ARCH%==win32-msvc9 move libtango_9.2.6_v90_x86_debug.zip C:/projects/cppTango
- cmd: if %ARCH%==x64-msvc9 move libtango_9.2.6_v90_x64_debug.msi C:/projects/cppTango
- cmd: if %ARCH%==x64-msvc9 move libtango_9.2.6_v90_x64_debug.zip C:/projects/cppTango
- cmd: if %ARCH%==win32-msvc10 move libtango_9.2.6_v100_x86_debug.msi C:/projects/cppTango
- cmd: if %ARCH%==win32-msvc10 move libtango_9.2.6_v100_x86_debug.zip C:/projects/cppTango
- cmd: if %ARCH%==x64-msvc10 move libtango_9.2.6_v100_x64_debug.msi C:/projects/cppTango
- cmd: if %ARCH%==x64-msvc10 move libtango_9.2.6_v100_x64_debug.zip C:/projects/cppTango
- cmd: if %ARCH%==x64-msvc12 move libtango_9.2.6_v120_x64_debug.msi C:/projects/cppTango
- cmd: if %ARCH%==x64-msvc12 move libtango_9.2.6_v120_x64_debug.zip C:/projects/cppTango
- cmd: if %ARCH%==x64-msvc14 move libtango_9.2.6_v140_x64_debug.msi C:/projects/cppTango
- cmd: if %ARCH%==x64-msvc14 move libtango_9.2.6_v140_x64_debug.zip C:/projects/cppTango


on_finish:
#RDP for finish
#- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))

on_failure:
#RDP for failure
- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))

artifacts:
- path: ./*.exe
- path: ./*.zip
- path: ./*.msi
Binary file added appveyor/Tango.ico
Binary file not shown.
Loading