Skip to content

Commit e47d033

Browse files
DominikKampDominikKamp
committed
Correct time includes
1 parent 248342f commit e47d033

File tree

4 files changed

+187
-241
lines changed

4 files changed

+187
-241
lines changed

‎examples/CMakeLists.txt‎

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -51,55 +51,3 @@ TARGET_LINK_LIBRARIES(bo_camelback bayesopt)
5151
ADD_EXECUTABLE(bo_compare ./bo_compare.cpp )
5252
add_dependencies(bo_compare bayesopt)
5353
TARGET_LINK_LIBRARIES(bo_compare bayesopt)
54-
55-
enable_language(C) #For OpenGL and bo_display demo
56-
57-
#Display test
58-
find_package(GLUT)
59-
find_package(OpenGL)
60-
if(OPENGL_FOUND AND GLUT_FOUND)
61-
62-
SET(DISPLAY_SRC
63-
../utils/displaygp.cpp
64-
)
65-
66-
if(GLUT_LIBRARY MATCHES freeglut_static.lib)
67-
add_definitions(-DFREEGLUT_STATIC)
68-
endif()
69-
70-
71-
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/matplotpp
72-
${GLUT_INCLUDE_DIRS}
73-
${GLUT_INCLUDE_DIR}
74-
${OpenGL_INCLUDE_DIRS})
75-
76-
link_directories(${GLUT_LIBRARY_DIRS}
77-
${OpenGL_LIBRARY_DIRS})
78-
79-
add_definitions(${GLUT_DEFINITIONS}
80-
${OpenGL_DEFINITIONS})
81-
82-
ADD_LIBRARY(matplotpp STATIC
83-
../matplotpp/matplotpp.cc
84-
../matplotpp/gl2ps.c
85-
)
86-
87-
TARGET_LINK_LIBRARIES(matplotpp
88-
${GLUT_LIBRARY} ${OPENGL_LIBRARY})
89-
90-
ADD_EXECUTABLE(bo_display
91-
./bo_display.cpp
92-
${DISPLAY_SRC})
93-
add_dependencies(bo_display bayesopt matplotpp)
94-
TARGET_LINK_LIBRARIES(bo_display bayesopt matplotpp
95-
${GLUT_LIBRARY} ${OPENGL_LIBRARY})
96-
97-
ADD_EXECUTABLE(bo_branin_display
98-
./bo_branin_display.cpp
99-
${DISPLAY_SRC})
100-
add_dependencies(bo_branin_display bayesopt matplotpp)
101-
TARGET_LINK_LIBRARIES(bo_branin_display bayesopt matplotpp
102-
${GLUT_LIBRARY} ${OPENGL_LIBRARY})
103-
104-
105-
endif()

‎nlopt2/CMakeLists.txt‎

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -27,25 +27,24 @@ INCLUDE(CheckTypeSize)
2727
#==============================================================================
2828
# COMPILATION CHECKINGS and CONFIGURATION GENERATION
2929
#==============================================================================
30-
CHECK_INCLUDE_FILES( unistd.h HAVE_UNISTD_H)
31-
CHECK_INCLUDE_FILES( string.h HAVE_STRING_H)
32-
CHECK_INCLUDE_FILES( strings.h HAVE_STRINGS_H)
33-
CHECK_INCLUDE_FILES( sys/stat.h HAVE_SYS_STAT_H)
34-
CHECK_INCLUDE_FILES( inttypes.h HAVE_INTTYPES_H)
35-
CHECK_INCLUDE_FILES( memory.h HAVE_MEMORY_H)
36-
CHECK_INCLUDE_FILES( stdlib.h HAVE_STDLIB_H)
37-
CHECK_INCLUDE_FILES( stdint.h HAVE_STDINT_H)
38-
39-
CHECK_INCLUDE_FILES( sys/types.h HAVE_SYS_TYPES_H)
40-
CHECK_INCLUDE_FILES( sys/types.h HAVE_SYS_TYPES_H)
41-
CHECK_INCLUDE_FILES( sys/types.h HAVE_SYS_TYPES_H)
42-
43-
CHECK_FUNCTION_EXISTS( isinf HAVE_ISINF)
44-
CHECK_FUNCTION_EXISTS( isinf HAVE_ISNAN)
45-
CHECK_FUNCTION_EXISTS( gettimeofday HAVE_GETTIMEOFDAY)
46-
CHECK_FUNCTION_EXISTS( qsort_r HAVE_QSORT_R)
47-
CHECK_FUNCTION_EXISTS( time HAVE_TIME)
48-
CHECK_FUNCTION_EXISTS( copysign HAVE_COPYSIGN)
30+
CHECK_INCLUDE_FILES(unistd.h HAVE_UNISTD_H)
31+
CHECK_INCLUDE_FILES(string.h HAVE_STRING_H)
32+
CHECK_INCLUDE_FILES(strings.h HAVE_STRINGS_H)
33+
CHECK_INCLUDE_FILES(sys/stat.h HAVE_SYS_STAT_H)
34+
CHECK_INCLUDE_FILES(inttypes.h HAVE_INTTYPES_H)
35+
CHECK_INCLUDE_FILES(memory.h HAVE_MEMORY_H)
36+
CHECK_INCLUDE_FILES(stdlib.h HAVE_STDLIB_H)
37+
CHECK_INCLUDE_FILES(stdint.h HAVE_STDINT_H)
38+
CHECK_INCLUDE_FILES(sys/types.h HAVE_SYS_TYPES_H)
39+
CHECK_INCLUDE_FILES(sys/time.h HAVE_SYS_TIME_H)
40+
CHECK_INCLUDE_FILES(time.h HAVE_TIME_H)
41+
42+
CHECK_FUNCTION_EXISTS(isinf HAVE_ISINF)
43+
CHECK_FUNCTION_EXISTS(isinf HAVE_ISNAN)
44+
CHECK_FUNCTION_EXISTS(gettimeofday HAVE_GETTIMEOFDAY)
45+
CHECK_FUNCTION_EXISTS(qsort_r HAVE_QSORT_R)
46+
CHECK_FUNCTION_EXISTS(time HAVE_TIME)
47+
CHECK_FUNCTION_EXISTS(copysign HAVE_COPYSIGN)
4948

5049
CHECK_TYPE_SIZE(uint32_t UINT32_T)
5150
IF(NOT HAVE_UINT32_T)

0 commit comments

Comments
 (0)