Skip to content

Commit

Permalink
Added AutoNet headers to AutoNet project
Browse files Browse the repository at this point in the history
  • Loading branch information
gtremper committed Jul 29, 2014
1 parent a76d6e4 commit 17c3223
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 4 deletions.
7 changes: 4 additions & 3 deletions contrib/C++11/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,16 @@ set(Cpp11_SRCS
boost_future.h
boost_rvalue.h
boost_shared_ptr.h
boost_system_error.h
boost_thread.h
boost_tuple.h
boost_type_traits.h
boost_utility.h
cpp11.h
make_unique.h
memory.h
memory_nostl11.h
stdafx.cpp
stdafx.h
mutex.h
type_index.h
unique_ptr.h
)

1 change: 1 addition & 0 deletions contrib/json11/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
add_library(json11 STATIC json11.cpp json11.hpp)
set_property(TARGET json11 PROPERTY FOLDER "contrib")
1 change: 1 addition & 0 deletions contrib/jzon/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
add_library(jzon STATIC Jzon.cpp Jzon.h)
set_property(TARGET jzon PROPERTY FOLDER "contrib")
13 changes: 13 additions & 0 deletions src/autonet/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,21 @@ include_directories(

set(AutoNet_SRCS
AutoNetServer.cpp
AutoNetServer.h
)

# All include files are located in /autowiring from here, so prepend that to all sources
set(AutoNet_SRCS_TEMP ${AutoNet_SRCS})
set(AutoNet_SRCS)
foreach(i ${AutoNet_SRCS_TEMP})
string(REGEX MATCH ".*\\.h" hfile ${i})
if(hfile)
list(APPEND AutoNet_SRCS ${PROJECT_SOURCE_DIR}/autowiring/${i})
else()
list(APPEND AutoNet_SRCS ${i})
endif()
endforeach()

ADD_MSVC_PRECOMPILED_HEADER("stdafx.h" "stdafx.cpp" AutoNet_SRCS)
add_library(AutoNet STATIC ${AutoNet_SRCS})
target_link_libraries(AutoNet Autowiring jzon ${Boost_LIBRARIES})
Expand Down
2 changes: 1 addition & 1 deletion src/autowiring/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ set(Autowiring_SRCS)
foreach(i ${Autowiring_SRCS_TEMP})
string(REGEX MATCH ".*\\.h" hfile ${i})
if(hfile)
list(APPEND Autowiring_SRCS ../../autowiring/${i})
list(APPEND Autowiring_SRCS ${PROJECT_SOURCE_DIR}/autowiring/${i})
else()
list(APPEND Autowiring_SRCS ${i})
endif()
Expand Down

0 comments on commit 17c3223

Please sign in to comment.