Skip to content

Commit

Permalink
Format
Browse files Browse the repository at this point in the history
  • Loading branch information
@JasonMarechal25
JasonMarechal25 committed Nov 17, 2023
1 parent a3256c1 commit e51d4f3
Show file tree
Hide file tree
Showing 10 changed files with 231 additions and 235 deletions.
78 changes: 39 additions & 39 deletions src/analyzer/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,57 +9,57 @@ include(../cmake/common-settings.cmake)


# Le main
Set(SRCS main.cpp
atsp/atsp.h
atsp/atsp.hxx
atsp/atsp.cpp
atsp/load.cpp
atsp/misc.cpp
atsp/preflight.cpp
atsp/correlations.cpp
atsp/cache.cpp
)
Set(SRCS main.cpp
atsp/atsp.h
atsp/atsp.hxx
atsp/atsp.cpp
atsp/load.cpp
atsp/misc.cpp
atsp/preflight.cpp
atsp/correlations.cpp
atsp/cache.cpp
)


if(WIN32)
file(REMOVE "${CMAKE_CURRENT_SOURCE_DIR}/win32/analyzer.o")
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/win32/analyzer.rc.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/win32/analyzer.rc")
if (WIN32)
file(REMOVE "${CMAKE_CURRENT_SOURCE_DIR}/win32/analyzer.o")
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/win32/analyzer.rc.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/win32/analyzer.rc")

if(MINGW)
# resource compilation for mingw
ADD_CUSTOM_COMMAND(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/win32/analyzer.o"
COMMAND windres.exe "-I${CMAKE_CURRENT_SOURCE_DIR}"
"-i${CMAKE_CURRENT_SOURCE_DIR}/win32/analyzer.rc"
-o "${CMAKE_CURRENT_BINARY_DIR}/win32/analyzer.o")
SET(SRCS ${SRCS} "${CMAKE_CURRENT_BINARY_DIR}/win32/analyzer.o")
else(MINGW)
if (MINGW)
# resource compilation for mingw
ADD_CUSTOM_COMMAND(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/win32/analyzer.o"
COMMAND windres.exe "-I${CMAKE_CURRENT_SOURCE_DIR}"
"-i${CMAKE_CURRENT_SOURCE_DIR}/win32/analyzer.rc"
-o "${CMAKE_CURRENT_BINARY_DIR}/win32/analyzer.o")
SET(SRCS ${SRCS} "${CMAKE_CURRENT_BINARY_DIR}/win32/analyzer.o")
else (MINGW)
FILE(COPY "${CMAKE_CURRENT_SOURCE_DIR}/win32/analyzer.ico" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/win32/")
SET(SRCS ${SRCS} "${CMAKE_CURRENT_BINARY_DIR}/win32/analyzer.rc")
endif(MINGW)
endif(WIN32)
SET(SRCS ${SRCS} "${CMAKE_CURRENT_BINARY_DIR}/win32/analyzer.rc")
endif (MINGW)
endif (WIN32)

add_executable(antares-${ANTARES_PRG_VERSION}-analyzer ${SRCS})
add_executable(antares-${ANTARES_PRG_VERSION}-analyzer ${SRCS})

install(TARGETS antares-${ANTARES_PRG_VERSION}-analyzer EXPORT antares-analyzer DESTINATION bin)

INSTALL(EXPORT antares-analyzer
FILE antares-analyzerConfig.cmake
DESTINATION cmake
FILE antares-analyzerConfig.cmake
DESTINATION cmake
)

target_link_libraries(antares-${ANTARES_PRG_VERSION}-analyzer
PRIVATE
yuni-static-core
Antares::args_helper
${CMAKE_THREADS_LIBS_INIT}
antares-core #local.h
Antares::misc
PUBLIC
Antares::study #atsp -> xcast
Antares::sys
Antares::locale
)
PRIVATE
yuni-static-core
Antares::args_helper
${CMAKE_THREADS_LIBS_INIT}
antares-core #local.h
Antares::misc
PUBLIC
Antares::study #atsp -> xcast
Antares::sys
Antares::locale
)

import_std_libs(antares-${ANTARES_PRG_VERSION}-analyzer)
executable_strip(antares-${ANTARES_PRG_VERSION}-analyzer)
Expand Down
42 changes: 20 additions & 22 deletions src/libs/antares/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@ add_subdirectory(resources)
add_subdirectory(sys)

set(HEADERS
include/antares/antares/antares.h
include/antares/antares/constants.h
include/antares/antares/fatal-error.h
include/antares/antares/version.h
include/antares/antares/Enum.hpp
include/antares/antares/Enum.hxx
include/antares/antares/antares.h
include/antares/antares/constants.h
include/antares/antares/fatal-error.h
include/antares/antares/version.h
include/antares/antares/Enum.hpp
include/antares/antares/Enum.hxx
)
set(SRC
${HEADERS}
constants.cpp
version.cpp
${HEADERS}
constants.cpp
version.cpp
)
add_subdirectory(date)

Expand All @@ -47,25 +47,23 @@ add_subdirectory(mersenne-twister)
add_subdirectory(series)

add_library(antares-core
${SRC}
${SRC}
)

#TODO : needed for include yuni : why yuni must be include first ??? cheat : made it public so everybody will have this include (should be done in yuni)
#TODO : needed for include
target_include_directories(antares-core
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
PRIVATE
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
PRIVATE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/libs>
)
)

target_link_libraries(antares-core
PUBLIC
yuni-static-core
Antares::logs
PUBLIC
yuni-static-core
Antares::logs
Antares::exception
Antares::study
Antares::config
)
Antares::study
Antares::config
)

import_std_libs(antares-core)
2 changes: 1 addition & 1 deletion src/libs/antares/checks/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ add_library(checks
add_library(Antares::checks ALIAS checks)

target_include_directories(checks
PUBLIC
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
)

Expand Down
16 changes: 8 additions & 8 deletions src/libs/antares/logs/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,24 @@ set(SRC_LOGS
logs.cpp
cleaner.cpp
hostinfo.cpp
)
)
source_group("misc\\logs" FILES ${SRC_LOGS})

add_library(${PROJ} ${SRC_LOGS})
add_library(Antares::${PROJ} ALIAS ${PROJ})

if(WIN32)
find_library(WSOCK32_LIBRARY wsock32)
find_library(WS2_32_LIBRARY ws2_32)
target_link_libraries(${PROJ} PUBLIC wsock32 ws2_32)
endif()
if (WIN32)
find_library(WSOCK32_LIBRARY wsock32)
find_library(WS2_32_LIBRARY ws2_32)
target_link_libraries(${PROJ} PUBLIC wsock32 ws2_32)
endif ()
target_link_libraries(${PROJ}
PUBLIC
yuni-static-core
antares-core
)
)

target_include_directories(${PROJ}
PUBLIC
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
)
2 changes: 1 addition & 1 deletion src/libs/antares/memory/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ target_link_libraries(${PROJ}
)

target_include_directories(${PROJ}
PUBLIC
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
)
2 changes: 1 addition & 1 deletion src/libs/antares/mersenne-twister/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ target_link_libraries(${PROJ}
)

target_include_directories(${PROJ}
PUBLIC
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
)
4 changes: 2 additions & 2 deletions src/libs/antares/object/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set(SRC_OBJECT
include/antares/object/object.hxx
object.cpp
include/antares/object/ref.h
)
)
source_group("object" FILES ${SRC_OBJECT})

add_library(object
Expand All @@ -18,7 +18,7 @@ target_link_libraries(object
PRIVATE
yuni-static-core
yuni-static-uuid
)
)

target_include_directories(
object
Expand Down
2 changes: 1 addition & 1 deletion src/libs/antares/paths/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ target_link_libraries(${PROJ}
)

target_include_directories(${PROJ}
PUBLIC
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
)
4 changes: 2 additions & 2 deletions src/libs/antares/series/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ target_sources(series PUBLIC
target_link_libraries(series PUBLIC Antares::array)

target_include_directories(series
PUBLIC
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
)

install(DIRECTORY include/antares
install(DIRECTORY include/antares
DESTINATION "include"
)
Loading

0 comments on commit e51d4f3

Please sign in to comment.