Skip to content

Commit

Permalink
fix include folders for test projects
Browse files Browse the repository at this point in the history
  • Loading branch information
tuncb committed Mar 7, 2018
1 parent a917902 commit a28cb7b
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 6 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,4 @@
*.out
*.app
/test_package/build
/build
6 changes: 3 additions & 3 deletions projects/CMakeLists.txt → CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ PROJECT(pugg_examples)
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)

add_subdirectory(Zoo)
add_subdirectory(PanthalassaAnimals)
add_subdirectory(PangeaAnimals)
add_subdirectory(./Projects/Zoo)
add_subdirectory(./Projects/PanthalassaAnimals)
add_subdirectory(./Projects/PangeaAnimals)


23 changes: 23 additions & 0 deletions generate.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
@echo off

setlocal
pushd %1

set build_folder="%~dp0./build/" || goto :FINALLY

if exist %build_folder% rd /q /s %build_folder% || goto :FINALLY
md %build_folder% || goto :FINALLY
cd %build_folder% || goto :FINALLY

cmake -G "Visual Studio 15 2017 Win64" ../ || goto :FINALLY

echo Success :)

:FINALLY
popd
endlocal

IF /I "%ERRORLEVEL%" NEQ "0" (
echo Solution generation failed with error #%ERRORLEVEL%.
exit /b %ERRORLEVEL%
)
2 changes: 1 addition & 1 deletion projects/PangeaAnimals/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.6.2)

PROJECT(PangeaAnimals)

include_directories("../../include")
include_directories("../pugg/include")
include_directories("../Zoo")

set(SOURCES plugin.cpp Cat.h Dog.h)
Expand Down
2 changes: 1 addition & 1 deletion projects/PanthalassaAnimals/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.6.2)

PROJECT(PanthalassaAnimals)

include_directories("../../include")
include_directories("../pugg/include")
include_directories("../Zoo")

set(SOURCES plugin.cpp Fish.h Whale.h)
Expand Down
2 changes: 1 addition & 1 deletion projects/Zoo/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.6.2)

PROJECT(Zoo)

include_directories("../../include")
include_directories("../pugg/include")
set(SOURCES main.cpp Animal.h)

add_executable(Zoo ${SOURCES})
Expand Down

0 comments on commit a28cb7b

Please sign in to comment.