Skip to content

Commit a366339

Browse files
starseekerstarseeker
committed
See if we can just do a straight up check on these.
1 parent 44fb196 commit a366339

File tree

7 files changed

+14
-14
lines changed

7 files changed

+14
-14
lines changed

‎src/base/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ if($CACHE{SC_MEMMGR_ENABLE_CHECKS})
3232
add_definitions(-DSC_MEMMGR_ENABLE_CHECKS)
3333
endif()
3434

35-
if($CACHE{SC_BUILD_SHARED_LIBS})
35+
if(BUILD_SHARED_LIBS)
3636
SC_ADDLIB(base SHARED SOURCES ${SC_BASE_SOURCES})
3737
if(WIN32)
3838
target_link_libraries(base psapi)
3939
target_compile_definitions(base PRIVATE SC_BASE_DLL_EXPORTS)
4040
endif()
4141
endif()
4242

43-
if($CACHE{SC_BUILD_STATIC_LIBS})
43+
if(BUILD_STATIC_LIBS)
4444
SC_ADDLIB(base-static STATIC SOURCES ${SC_BASE_SOURCES})
4545
if(WIN32)
4646
target_link_libraries(base-static psapi)

‎src/cldai/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ include_directories(
3636

3737
set(_libdeps steputils base)
3838

39-
if($CACHE{SC_BUILD_SHARED_LIBS})
39+
if(BUILD_SHARED_LIBS)
4040
SC_ADDLIB(stepdai SHARED SOURCES ${LIBSTEPDAI_SRCS} LINK_LIBRARIES ${_libdeps})
4141
if(WIN32)
4242
target_compile_definitions(stepdai PRIVATE SC_DAI_DLL_EXPORTS)
4343
endif()
4444
endif()
4545

46-
if($CACHE{SC_BUILD_STATIC_LIBS})
46+
if(BUILD_STATIC_LIBS)
4747
SC_ADDLIB(stepdai-static STATIC SOURCES ${LIBSTEPDAI_SRCS} LINK_LIBRARIES $<JOIN:${_libdeps},-static >-static)
4848
endif()
4949

‎src/cleditor/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ include_directories(
2727
${SC_SOURCE_DIR}/src/clutils
2828
)
2929

30-
if($CACHE{SC_BUILD_SHARED_LIBS})
30+
if(BUILD_SHARED_LIBS)
3131
SC_ADDLIB(stepeditor SHARED SOURCES ${LIBSTEPEDITOR_SRCS} LINK_LIBRARIES stepcore stepdai steputils base)
3232
if(WIN32)
3333
target_compile_definitions(stepeditor PRIVATE SC_EDITOR_DLL_EXPORTS)
3434
endif()
3535
endif()
3636

37-
if($CACHE{SC_BUILD_STATIC_LIBS})
37+
if(BUILD_STATIC_LIBS)
3838
SC_ADDLIB(stepeditor-static STATIC SOURCES ${LIBSTEPEDITOR_SRCS} LINK_LIBRARIES stepcore-static stepdai-static steputils-static base-static)
3939
endif()
4040

‎src/cllazyfile/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ include_directories(
3232

3333
set(_libdeps stepcore stepdai steputils base stepeditor)
3434

35-
if($CACHE{SC_BUILD_SHARED_LIBS})
35+
if(BUILD_SHARED_LIBS)
3636
SC_ADDLIB(steplazyfile SHARED SOURCES ${clLazyFile_SRCS} LINK_LIBRARIES ${_libdeps})
3737
if(WIN32)
3838
target_compile_definitions(steplazyfile PRIVATE SC_LAZYFILE_DLL_EXPORTS)
3939
endif()
4040
endif()
4141

42-
if($CACHE{SC_BUILD_STATIC_LIBS})
42+
if(BUILD_STATIC_LIBS)
4343
SC_ADDLIB(steplazyfile-static STATIC SOURCES ${clLazyFile_SRCS} LINK_LIBRARIES $<JOIN:${_libdeps},-static >-static)
4444
endif()
4545

‎src/clstepcore/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,14 +133,14 @@ include_directories(
133133

134134
set(_libdeps steputils stepdai base)
135135

136-
if($CACHE{SC_BUILD_SHARED_LIBS})
136+
if(BUILD_SHARED_LIBS)
137137
SC_ADDLIB(stepcore SHARED SOURCES ${LIBSTEPCORE_SRCS} LINK_LIBRARIES ${_libdeps})
138138
if(WIN32)
139139
target_compile_definitions(stepcore PRIVATE SC_CORE_DLL_EXPORTS)
140140
endif()
141141
endif()
142142

143-
if($CACHE{SC_BUILD_STATIC_LIBS})
143+
if(BUILD_STATIC_LIBS)
144144
SC_ADDLIB(stepcore-static STATIC SOURCES ${LIBSTEPCORE_SRCS} LINK_LIBRARIES $<JOIN:${_libdeps},-static>-static)
145145
endif()
146146

‎src/clutils/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ include_directories(
2525
${CMAKE_CURRENT_SOURCE_DIR}
2626
)
2727

28-
if($CACHE{SC_BUILD_SHARED_LIBS})
28+
if(BUILD_SHARED_LIBS)
2929
SC_ADDLIB(steputils SHARED SOURCES ${LIBSTEPUTILS_SRCS} LINK_LIBRARIES base)
3030
if(WIN32)
3131
target_compile_definitions(steputils PRIVATE SC_UTILS_DLL_EXPORTS)
3232
target_link_libraries(steputils shlwapi)
3333
endif()
3434
endif()
3535

36-
if($CACHE{SC_BUILD_STATIC_LIBS})
36+
if(BUILD_STATIC_LIBS)
3737
SC_ADDLIB(steputils-static STATIC SOURCES ${LIBSTEPUTILS_SRCS} LINK_LIBRARIES base-static)
3838
if(WIN32)
3939
target_link_libraries(steputils-static shlwapi)

‎src/exppp/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ include_directories(
3030
${SC_SOURCE_DIR}/src/express
3131
)
3232

33-
if($CACHE{SC_BUILD_SHARED_LIBS})
33+
if(BUILD_SHARED_LIBS)
3434
SC_ADDLIB(libexppp SHARED SOURCES ${LIBEXPPP_SOURCES} LINK_LIBRARIES express base)
3535
set_target_properties(libexppp PROPERTIES PREFIX "")
3636
if(WIN32)
3737
target_compile_definitions(libexppp PRIVATE SC_EXPPP_DLL_EXPORTS)
3838
endif()
3939
endif()
4040

41-
if($CACHE{SC_BUILD_STATIC_LIBS})
41+
if(BUILD_STATIC_LIBS)
4242
SC_ADDLIB(libexppp-static STATIC SOURCES ${LIBEXPPP_SOURCES} LINK_LIBRARIES express-static base-static)
4343
set_target_properties(libexppp-static PROPERTIES PREFIX "")
4444
endif()

0 commit comments

Comments
 (0)