Skip to content

CMake Updates #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
concubidated wants to merge 3 commits into
base: personal-5_1-new
Choose a base branch
from
Open

CMake Updates #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b67a031
CMakeData Singletons - Add HTTP Helpers
concubidated Jun 7, 2017
b1320d2
CMakeData Arch - Add LightsDriver_Export for OSX
concubidated Jun 7, 2017
3b28551
TimingData: should be ssprintf
concubidated Jun 7, 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
5 changes: 2 additions & 3 deletions src/CMakeData-arch.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,8 +338,7 @@ list(APPEND SMDATA_ARCH_LIGHTS_HPP
"arch/Lights/LightsDriver_EXTIO.h"
)

# TODO: Confirm if Apple can use the export.
if(NOT APPLE)
if(NOT WIN32)
list(APPEND SMDATA_ARCH_LIGHTS_SRC
"arch/Lights/LightsDriver_Export.cpp"
)
Expand Down Expand Up @@ -394,7 +393,7 @@ if(NOT APPLE)
endif()
endif()
endif(WIN32)
endif(NOT APPLE)
endif(NOT WIN32)

source_group("Arch Specific\\\\Lights" FILES ${SMDATA_ARCH_LIGHTS_SRC} ${SMDATA_ARCH_LIGHTS_HPP})

Expand Down
2 changes: 2 additions & 0 deletions src/CMakeData-singletons.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,11 @@ list(APPEND SMDATA_GLOBAL_SINGLETON_HPP
if(WITH_NETWORKING)
list(APPEND SMDATA_GLOBAL_SINGLETON_SRC
"ezsockets.cpp"
"HTTPHelper.cpp"
)
list(APPEND SMDATA_GLOBAL_SINGLETON_HPP
"ezsockets.h"
"HTTPHelper.h"
)
endif()

Expand Down
2 changes: 1 addition & 1 deletion src/TimingData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ template<class T>
inline T ToDerived( const TimingSegment *t, TimingSegmentType tst )
{
ASSERT_M( t && tst == t->GetType(),
sprintf("type mismatch (expected %s, got %s)",
ssprintf("type mismatch (expected %s, got %s)",
TimingSegmentTypeToString(tst).c_str(),
TimingSegmentTypeToString(t->GetType()).c_str() ) );

Expand Down